diff options
| author | erfanian <erfanian@google.com> | 2018-06-29 10:02:43 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-06-29 11:28:42 -0700 |
| commit | 58672a6e31dab08628cfeca02a896c48254ed209 (patch) | |
| tree | d45b5be2b04d464cce44d9684a607f21eb8949f3 /java | |
| parent | ef058068d08efa9344a27b4e0454df9bc0025a56 (diff) | |
| download | android_packages_apps_Dialer-58672a6e31dab08628cfeca02a896c48254ed209.tar.gz android_packages_apps_Dialer-58672a6e31dab08628cfeca02a896c48254ed209.tar.bz2 android_packages_apps_Dialer-58672a6e31dab08628cfeca02a896c48254ed209.zip | |
Remove more instances of guava optional for built in optional.
Test: tap
PiperOrigin-RevId: 202663404
Change-Id: Ic229d77f8f14bb9e60e82889ed5788dee600e957
Diffstat (limited to 'java')
3 files changed, 5 insertions, 5 deletions
diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java index 9db42d75f..fa4a06ecf 100644 --- a/java/com/android/incallui/InCallActivity.java +++ b/java/com/android/incallui/InCallActivity.java @@ -96,12 +96,12 @@ import com.android.incallui.video.bindings.VideoBindings; import com.android.incallui.video.protocol.VideoCallScreen; import com.android.incallui.video.protocol.VideoCallScreenDelegate; import com.android.incallui.video.protocol.VideoCallScreenDelegateFactory; -import com.google.common.base.Optional; import com.google.common.util.concurrent.ListenableFuture; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.List; +import java.util.Optional; /** Version of {@link InCallActivity} that shows the new UI */ public class InCallActivity extends TransactionSafeFragmentActivity @@ -124,7 +124,7 @@ public class InCallActivity extends TransactionSafeFragmentActivity private static final int DIALPAD_REQUEST_SHOW = 2; private static final int DIALPAD_REQUEST_HIDE = 3; - private static Optional<Integer> audioRouteForTesting = Optional.absent(); + private static Optional<Integer> audioRouteForTesting = Optional.empty(); private SelectPhoneAccountListener selectPhoneAccountListener; private UiListener<Result> preferredAccountWorkerResultListener; 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. */ |