diff options
Diffstat (limited to 'java/com/android/incallui/call')
-rw-r--r-- | java/com/android/incallui/call/CallList.java | 13 | ||||
-rw-r--r-- | java/com/android/incallui/call/DialerCall.java | 105 | ||||
-rw-r--r-- | java/com/android/incallui/call/DialerCallListener.java | 2 | ||||
-rw-r--r-- | java/com/android/incallui/call/TelecomAdapter.java | 8 |
4 files changed, 2 insertions, 126 deletions
diff --git a/java/com/android/incallui/call/CallList.java b/java/com/android/incallui/call/CallList.java index 3876ca64d..34f0cc0d7 100644 --- a/java/com/android/incallui/call/CallList.java +++ b/java/com/android/incallui/call/CallList.java @@ -32,8 +32,6 @@ import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler; import com.android.dialer.blocking.FilteredNumbersUtil; import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; -import com.android.dialer.enrichedcall.EnrichedCallComponent; -import com.android.dialer.enrichedcall.EnrichedCallManager; import com.android.dialer.location.GeoUtil; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; @@ -119,10 +117,6 @@ public class CallList implements DialerCallDelegate { new DialerCall(context, this, telecomCall, latencyReport, true /* registerCallback */); logSecondIncomingCall(context, call); - EnrichedCallManager manager = EnrichedCallComponent.get(context).getEnrichedCallManager(); - manager.registerCapabilitiesListener(call); - manager.registerStateChangedListener(call); - final DialerCallListenerImpl dialerCallListener = new DialerCallListenerImpl(call); call.addListener(dialerCallListener); LogUtil.d("CallList.onCallAdded", "callState=" + call.getState()); @@ -284,10 +278,6 @@ public class CallList implements DialerCallDelegate { DialerCall call = mCallByTelecomCall.get(telecomCall); Assert.checkArgument(!call.isExternalCall()); - EnrichedCallManager manager = EnrichedCallComponent.get(context).getEnrichedCallManager(); - manager.unregisterCapabilitiesListener(call); - manager.unregisterStateChangedListener(call); - // Don't log an already logged call. logCall() might be called multiple times // for the same call due to b/24109437. if (call.getLogState() != null && !call.getLogState().isLogged) { @@ -803,9 +793,6 @@ public class CallList implements DialerCallDelegate { } @Override - public void onEnrichedCallSessionUpdate() {} - - @Override public void onDialerCallSessionModificationStateChange() { for (Listener listener : mListeners) { listener.onSessionModificationStateChange(mCall); 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<>(); diff --git a/java/com/android/incallui/call/DialerCallListener.java b/java/com/android/incallui/call/DialerCallListener.java index 5d24a4d4b..ed321be05 100644 --- a/java/com/android/incallui/call/DialerCallListener.java +++ b/java/com/android/incallui/call/DialerCallListener.java @@ -36,6 +36,4 @@ public interface DialerCallListener { void onHandoverToWifiFailure(); void onInternationalCallOnWifi(); - - void onEnrichedCallSessionUpdate(); } diff --git a/java/com/android/incallui/call/TelecomAdapter.java b/java/com/android/incallui/call/TelecomAdapter.java index 4fc9f81eb..ebf4ecf4f 100644 --- a/java/com/android/incallui/call/TelecomAdapter.java +++ b/java/com/android/incallui/call/TelecomAdapter.java @@ -20,13 +20,12 @@ import android.content.ActivityNotFoundException; import android.content.Intent; import android.os.Looper; import android.support.annotation.MainThread; -import android.support.annotation.VisibleForTesting; import android.telecom.InCallService; import com.android.dialer.common.LogUtil; import java.util.List; /** Wrapper around Telecom APIs. */ -public class TelecomAdapter implements InCallServiceListener { +public final class TelecomAdapter implements InCallServiceListener { private static final String ADD_CALL_MODE_KEY = "add_call_mode"; @@ -46,11 +45,6 @@ public class TelecomAdapter implements InCallServiceListener { return sInstance; } - @VisibleForTesting(otherwise = VisibleForTesting.NONE) - public static void setInstanceForTesting(TelecomAdapter telecomAdapter) { - sInstance = telecomAdapter; - } - @Override public void setInCallService(InCallService inCallService) { mInCallService = inCallService; |