diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-07-14 22:00:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-14 22:00:33 +0000 |
| commit | b63b031cb5b9338daa3de76ee9976ba493037d92 (patch) | |
| tree | 24d07e79e578b67aa64d4c4d41ae68a20eaa53c6 /telecomm | |
| parent | d69a82c107cea4aca87eecc3978e21ea9bc23c82 (diff) | |
| parent | e911c8d19662b7eaee07ffa4bfe8822d51c9ee21 (diff) | |
| download | frameworks_base-b63b031cb5b9338daa3de76ee9976ba493037d92.zip frameworks_base-b63b031cb5b9338daa3de76ee9976ba493037d92.tar.gz frameworks_base-b63b031cb5b9338daa3de76ee9976ba493037d92.tar.bz2 | |
Merge "Standardize stateToString return values" into mnc-dev
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 f304d1d..58fb088 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -1231,17 +1231,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: |