From e3c507b79b5ce94f54533a92d5625daa486b7ed6 Mon Sep 17 00:00:00 2001 From: Santos Cordon Date: Thu, 23 Apr 2015 14:44:19 -0700 Subject: Remove CallState and rename PRE_DIAL_WAIT Bug: 20532827 Bug: 20532435 Change-Id: I5f0308c5cf4e4a9cf9020b4fe7fa5f3f8dee6e67 --- telecomm/java/android/telecom/Call.java | 43 +++++++++------------------------ 1 file changed, 12 insertions(+), 31 deletions(-) (limited to 'telecomm/java/android/telecom/Call.java') diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java index bbd5e30..2a30384 100644 --- a/telecomm/java/android/telecom/Call.java +++ b/telecomm/java/android/telecom/Call.java @@ -66,9 +66,18 @@ public final class Call { public static final int STATE_DISCONNECTED = 7; /** - * The state of an outgoing {@code Call}, but waiting for user input before proceeding. + * The state of an outgoing {@code Call} when waiting on user to select a + * {@link PhoneAccount} through which to place the call. */ - public static final int STATE_PRE_DIAL_WAIT = 8; + public static final int STATE_SELECT_PHONE_ACCOUNT = 8; + + /** + * @hide + * @deprecated use STATE_SELECT_PHONE_ACCOUNT. + */ + @Deprecated + @SystemApi + public static final int STATE_PRE_DIAL_WAIT = STATE_SELECT_PHONE_ACCOUNT; /** * The initial state of an outgoing {@code Call}. @@ -929,7 +938,7 @@ public final class Call { mVideoCall = parcelableCall.getVideoCall(); } - int state = stateFromParcelableCallState(parcelableCall.getState()); + int state = parcelableCall.getState(); boolean stateChanged = mState != state; if (stateChanged) { mState = state; @@ -1064,32 +1073,4 @@ public final class Call { callback.onConferenceableCallsChanged(this, mUnmodifiableConferenceableCalls); } } - - private int stateFromParcelableCallState(int parcelableCallState) { - switch (parcelableCallState) { - case CallState.NEW: - return STATE_NEW; - case CallState.CONNECTING: - return STATE_CONNECTING; - case CallState.PRE_DIAL_WAIT: - return STATE_PRE_DIAL_WAIT; - case CallState.DIALING: - return STATE_DIALING; - case CallState.RINGING: - return STATE_RINGING; - case CallState.ACTIVE: - return STATE_ACTIVE; - case CallState.ON_HOLD: - return STATE_HOLDING; - case CallState.DISCONNECTED: - return STATE_DISCONNECTED; - case CallState.ABORTED: - return STATE_DISCONNECTED; - case CallState.DISCONNECTING: - return STATE_DISCONNECTING; - default: - Log.wtf(this, "Unrecognized CallState %s", parcelableCallState); - return STATE_NEW; - } - } } -- cgit v1.1