diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-06-29 18:54:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-29 18:54:45 +0000 |
| commit | 3c185928853f663200826112de82987bc7d2c3d5 (patch) | |
| tree | d45b5be2b04d464cce44d9684a607f21eb8949f3 /java/com/android/incallui/speakeasy | |
| parent | ef058068d08efa9344a27b4e0454df9bc0025a56 (diff) | |
| parent | 58672a6e31dab08628cfeca02a896c48254ed209 (diff) | |
Merge "Remove more instances of guava optional for built in optional."
Diffstat (limited to 'java/com/android/incallui/speakeasy')
| -rw-r--r-- | java/com/android/incallui/speakeasy/SpeakEasyCallManager.java | 2 | ||||
| -rw-r--r-- | java/com/android/incallui/speakeasy/SpeakEasyCallManagerStub.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/java/com/android/incallui/speakeasy/SpeakEasyCallManager.java b/java/com/android/incallui/speakeasy/SpeakEasyCallManager.java index f2916f46f..55905ceb3 100644 --- a/java/com/android/incallui/speakeasy/SpeakEasyCallManager.java +++ b/java/com/android/incallui/speakeasy/SpeakEasyCallManager.java @@ -20,8 +20,8 @@ import android.content.Context; import android.support.annotation.NonNull; import android.support.v4.app.Fragment; import com.android.incallui.call.DialerCall; -import com.google.common.base.Optional; import com.google.common.util.concurrent.ListenableFuture; +import java.util.Optional; /** Provides operations necessary to SpeakEasy. */ public interface SpeakEasyCallManager { diff --git a/java/com/android/incallui/speakeasy/SpeakEasyCallManagerStub.java b/java/com/android/incallui/speakeasy/SpeakEasyCallManagerStub.java index da5e88aa3..4eebc809e 100644 --- a/java/com/android/incallui/speakeasy/SpeakEasyCallManagerStub.java +++ b/java/com/android/incallui/speakeasy/SpeakEasyCallManagerStub.java @@ -21,9 +21,9 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; import com.android.incallui.call.DialerCall; -import com.google.common.base.Optional; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import java.util.Optional; import javax.inject.Inject; /** Default implementation of SpeakEasyCallManager. */ @@ -36,7 +36,7 @@ public class SpeakEasyCallManagerStub implements SpeakEasyCallManager { @Override @Nullable public Optional<Fragment> getSpeakEasyFragment(DialerCall call) { - return Optional.absent(); + return Optional.empty(); } /** Always inert in the stub. */ |