diff options
author | erfanian <erfanian@google.com> | 2018-06-29 12:05:50 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-06-29 12:05:50 -0700 |
commit | d0ea13da747a9f17fb8f114201f7d5b500bf806c (patch) | |
tree | 4732362932f7e6b6c17d59c17c397d05590d1a2d /java/com/android/incallui/speakeasy/SpeakEasyCallManagerStub.java | |
parent | 06583016549f6bc849682b8b6f1acdb5fc01b253 (diff) | |
parent | 90f61762dade30ffcbea3492dbe2b9c09fda5969 (diff) |
Merge "Remove more instances of guava optional for built in optional." am: 3c18592885
am: 90f61762da
Change-Id: Iee190e29d1ae4e45d716aaa55f152a636c7fc94b
Diffstat (limited to 'java/com/android/incallui/speakeasy/SpeakEasyCallManagerStub.java')
-rw-r--r-- | java/com/android/incallui/speakeasy/SpeakEasyCallManagerStub.java | 4 |
1 files changed, 2 insertions, 2 deletions
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. */ |