Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58672a6e authored by erfanian's avatar erfanian Committed by Copybara-Service
Browse files

Remove more instances of guava optional for built in optional. 

Test: tap
PiperOrigin-RevId: 202663404
Change-Id: Ic229d77f8f14bb9e60e82889ed5788dee600e957
parent ef058068

java/com/android/incallui/InCallActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

java/com/android/incallui/speakeasy/SpeakEasyCallManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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 {

java/com/android/incallui/speakeasy/SpeakEasyCallManagerStub.java

+2 −2
Original line number Diff line number Diff line
@@ -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. */