diff options
| author | maxwelb <maxwelb@google.com> | 2017-06-28 14:04:21 -0700 |
|---|---|---|
| committer | Brandon Maxwell <maxwelb@google.com> | 2017-06-30 14:40:31 -0700 |
| commit | 8e3d56ca5de3ca651d27d560eba406be21eb7aa1 (patch) | |
| tree | caf5a3cb8bd3046cfde4163e8117d45f3b58bc75 /java/com/android/dialer/callcomposer | |
| parent | ad2cb45e7006de3fbe1d953a61c57345ca40a6a0 (diff) | |
Move Session State definition into Session
The state of a session is more closely tied to the session itself,
rather than the EnrichedCallManager. The enum was originally placed in
the Manager as it was used in the API, but now that's no longer the
case.
This CL moves the Session State declaration into Session, which is a
more appropriate location.
Test: tap
PiperOrigin-RevId: 160448612
Change-Id: I907476140bc174a061d48ee8e58878af64a62b29
Diffstat (limited to 'java/com/android/dialer/callcomposer')
| -rw-r--r-- | java/com/android/dialer/callcomposer/CallComposerActivity.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/java/com/android/dialer/callcomposer/CallComposerActivity.java b/java/com/android/dialer/callcomposer/CallComposerActivity.java index 2f652e424..c22113fcc 100644 --- a/java/com/android/dialer/callcomposer/CallComposerActivity.java +++ b/java/com/android/dialer/callcomposer/CallComposerActivity.java @@ -64,8 +64,8 @@ import com.android.dialer.constants.Constants; import com.android.dialer.dialercontact.DialerContact; import com.android.dialer.enrichedcall.EnrichedCallComponent; import com.android.dialer.enrichedcall.EnrichedCallManager; -import com.android.dialer.enrichedcall.EnrichedCallManager.State; import com.android.dialer.enrichedcall.Session; +import com.android.dialer.enrichedcall.Session.State; import com.android.dialer.enrichedcall.extensions.StateExtension; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; @@ -255,25 +255,25 @@ public class CallComposerActivity extends AppCompatActivity StateExtension.toString(state)); switch (state) { - case EnrichedCallManager.STATE_STARTING: + case Session.STATE_STARTING: timeoutHandler.postDelayed(sessionStartedTimedOut, getSessionStartedTimeoutMillis()); if (sendAndCallReady) { showLoadingUi(); } break; - case EnrichedCallManager.STATE_STARTED: + case Session.STATE_STARTED: timeoutHandler.removeCallbacks(sessionStartedTimedOut); if (sendAndCallReady) { sendAndCall(); } break; - case EnrichedCallManager.STATE_START_FAILED: - case EnrichedCallManager.STATE_CLOSED: + case Session.STATE_START_FAILED: + case Session.STATE_CLOSED: setFailedResultAndFinish(); break; - case EnrichedCallManager.STATE_MESSAGE_FAILED: - case EnrichedCallManager.STATE_MESSAGE_SENT: - case EnrichedCallManager.STATE_NONE: + case Session.STATE_MESSAGE_FAILED: + case Session.STATE_MESSAGE_SENT: + case Session.STATE_NONE: default: break; } @@ -385,7 +385,7 @@ public class CallComposerActivity extends AppCompatActivity private boolean sessionReady() { Session session = getEnrichedCallManager().getSession(sessionId); - return session != null && session.getState() == EnrichedCallManager.STATE_STARTED; + return session != null && session.getState() == Session.STATE_STARTED; } private void placeRCSCall(MultimediaData.Builder builder) { |