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/InCallActivity.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/InCallActivity.java')
| -rw-r--r-- | java/com/android/incallui/InCallActivity.java | 4 |
1 files changed, 2 insertions, 2 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; |