diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-07-14 22:12:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-14 22:12:04 +0000 |
| commit | 95f270de2fe62ca78f05ef7300bfef7e0bcbc7a5 (patch) | |
| tree | fee78bcfea027223e84363a1ffb8ea02a343d22d /telecomm | |
| parent | ef77c116f3c1272f623627aec997c10c1432b03c (diff) | |
| parent | b63b031cb5b9338daa3de76ee9976ba493037d92 (diff) | |
| download | frameworks_base-95f270de2fe62ca78f05ef7300bfef7e0bcbc7a5.zip frameworks_base-95f270de2fe62ca78f05ef7300bfef7e0bcbc7a5.tar.gz frameworks_base-95f270de2fe62ca78f05ef7300bfef7e0bcbc7a5.tar.bz2 | |
am b63b031c: Merge "Standardize stateToString return values" into mnc-dev
* commit 'b63b031cb5b9338daa3de76ee9976ba493037d92':
Standardize stateToString return values
Diffstat (limited to 'telecomm')
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 93cea97..377c44b 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -1238,17 +1238,17 @@ public abstract class Connection extends Conferenceable { public static String stateToString(int state) { switch (state) { case STATE_INITIALIZING: - return "STATE_INITIALIZING"; + return "INITIALIZING"; case STATE_NEW: - return "STATE_NEW"; + return "NEW"; case STATE_RINGING: - return "STATE_RINGING"; + return "RINGING"; case STATE_DIALING: - return "STATE_DIALING"; + return "DIALING"; case STATE_ACTIVE: - return "STATE_ACTIVE"; + return "ACTIVE"; case STATE_HOLDING: - return "STATE_HOLDING"; + return "HOLDING"; case STATE_DISCONNECTED: return "DISCONNECTED"; default: |