From cded3beaf28a703e1ef8f71bbc6836e6806c3736 Mon Sep 17 00:00:00 2001
From: Tobias Thierer <tobiast@google.com>
Date: Fri, 9 Jun 2017 14:16:05 +0000
Subject: Revert "Update AOSP Dialer source from internal google3 repository at
 cl/158012278. am: 91ce7d2a47"

This reverts commit c67d658e7daa453fe9ad9fd1a37f81eaf2048c44.

Reason for revert: This CL broke the sailfish-userdebug_javac-all target on master.

Change-Id: I9b54333a654c00154ca84f4ece84bea4f07cc19b
---
 java/com/android/incallui/call/DialerCall.java | 105 +------------------------
 1 file changed, 1 insertion(+), 104 deletions(-)

(limited to 'java/com/android/incallui/call/DialerCall.java')

diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java
index 12edb07e6..acedf41f1 100644
--- a/java/com/android/incallui/call/DialerCall.java
+++ b/java/com/android/incallui/call/DialerCall.java
@@ -51,10 +51,6 @@ import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.enrichedcall.EnrichedCallCapabilities;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
-import com.android.dialer.enrichedcall.EnrichedCallManager;
-import com.android.dialer.enrichedcall.EnrichedCallManager.CapabilitiesListener;
-import com.android.dialer.enrichedcall.EnrichedCallManager.Filter;
-import com.android.dialer.enrichedcall.EnrichedCallManager.StateChangedListener;
 import com.android.dialer.enrichedcall.Session;
 import com.android.dialer.lightbringer.LightbringerComponent;
 import com.android.dialer.logging.ContactLookupResult;
@@ -81,7 +77,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
 
 /** Describes a single call and its state. */
-public class DialerCall implements VideoTechListener, StateChangedListener, CapabilitiesListener {
+public class DialerCall implements VideoTechListener {
 
   public static final int CALL_HISTORY_STATUS_UNKNOWN = 0;
   public static final int CALL_HISTORY_STATUS_PRESENT = 1;
@@ -147,12 +143,6 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa
   private EnrichedCallCapabilities mEnrichedCallCapabilities;
   private Session mEnrichedCallSession;
 
-  private int answerAndReleaseButtonDisplayedTimes = 0;
-  private boolean releasedByAnsweringSecondCall = false;
-  // Times when a second call is received but AnswerAndRelease button is not shown
-  // since it's not supported.
-  private int secondCallWithoutAnswerAndReleasedButtonTimes = 0;
-
   public static String getNumberFromHandle(Uri handle) {
     return handle == null ? "" : handle.getSchemeSpecificPart();
   }
@@ -302,8 +292,6 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa
 
     mTimeAddedMs = System.currentTimeMillis();
     parseCallSpecificAppData();
-
-    updateEnrichedCallSession();
   }
 
   private static int translateState(int state) {
@@ -425,12 +413,6 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa
       for (DialerCallListener listener : mListeners) {
         listener.onDialerCallDisconnect();
       }
-      EnrichedCallComponent.get(mContext)
-          .getEnrichedCallManager()
-          .unregisterCapabilitiesListener(this);
-      EnrichedCallComponent.get(mContext)
-          .getEnrichedCallManager()
-          .unregisterCapabilitiesListener(this);
     } else {
       for (DialerCallListener listener : mListeners) {
         listener.onDialerCallUpdate();
@@ -978,30 +960,6 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa
     return mLatencyReport;
   }
 
-  public int getAnswerAndReleaseButtonDisplayedTimes() {
-    return answerAndReleaseButtonDisplayedTimes;
-  }
-
-  public void increaseAnswerAndReleaseButtonDisplayedTimes() {
-    answerAndReleaseButtonDisplayedTimes++;
-  }
-
-  public boolean getReleasedByAnsweringSecondCall() {
-    return releasedByAnsweringSecondCall;
-  }
-
-  public void setReleasedByAnsweringSecondCall(boolean releasedByAnsweringSecondCall) {
-    this.releasedByAnsweringSecondCall = releasedByAnsweringSecondCall;
-  }
-
-  public int getSecondCallWithoutAnswerAndReleasedButtonTimes() {
-    return secondCallWithoutAnswerAndReleasedButtonTimes;
-  }
-
-  public void increaseSecondCallWithoutAnswerAndReleasedButtonTimes() {
-    secondCallWithoutAnswerAndReleasedButtonTimes++;
-  }
-
   @Nullable
   public EnrichedCallCapabilities getEnrichedCallCapabilities() {
     return mEnrichedCallCapabilities;
@@ -1214,66 +1172,6 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa
     TelecomAdapter.getInstance().setAudioRoute(CallAudioState.ROUTE_SPEAKER);
   }
 
-  @Override
-  public void onCapabilitiesUpdated() {
-    if (getNumber() == null) {
-      return;
-    }
-    EnrichedCallCapabilities capabilities =
-        EnrichedCallComponent.get(mContext).getEnrichedCallManager().getCapabilities(getNumber());
-    if (capabilities != null) {
-      setEnrichedCallCapabilities(capabilities);
-      update();
-    }
-  }
-
-  @Override
-  public void onEnrichedCallStateChanged() {
-    updateEnrichedCallSession();
-  }
-
-  private void updateEnrichedCallSession() {
-    if (getNumber() == null) {
-      return;
-    }
-    if (getEnrichedCallSession() != null) {
-      // State changes to existing sessions are currently handled by the UI components (which have
-      // their own listeners). Someday instead we could remove those and just call update() here and
-      // have the usual onDialerCallUpdate update the UI.
-      dispatchOnEnrichedCallSessionUpdate();
-      return;
-    }
-
-    EnrichedCallManager manager = EnrichedCallComponent.get(mContext).getEnrichedCallManager();
-
-    Filter filter =
-        isIncoming()
-            ? manager.createIncomingCallComposerFilter()
-            : manager.createOutgoingCallComposerFilter();
-
-    Session session = manager.getSession(getUniqueCallId(), getNumber(), filter);
-    if (session == null) {
-      return;
-    }
-
-    session.setUniqueDialerCallId(getUniqueCallId());
-    setEnrichedCallSession(session);
-
-    LogUtil.i(
-        "DialerCall.updateEnrichedCallSession",
-        "setting session %d's dialer id to %s",
-        session.getSessionId(),
-        getUniqueCallId());
-
-    dispatchOnEnrichedCallSessionUpdate();
-  }
-
-  private void dispatchOnEnrichedCallSessionUpdate() {
-    for (DialerCallListener listener : mListeners) {
-      listener.onEnrichedCallSessionUpdate();
-    }
-  }
-
   /**
    * Specifies whether a number is in the call history or not. {@link #CALL_HISTORY_STATUS_UNKNOWN}
    * means there is no result.
@@ -1474,7 +1372,6 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa
 
       String phoneNumber = call.getNumber();
       phoneNumber = phoneNumber != null ? phoneNumber : "";
-      phoneNumber = phoneNumber.replaceAll("[^+0-9]", "");
 
       // Insert order here determines the priority of that video tech option
       videoTechs = new ArrayList<>();
-- 
cgit v1.2.3