am b63b031c: Merge "Standardize stateToString return values" into mnc-dev

* commit 'b63b031cb5b9338daa3de76ee9976ba493037d92': Standardize stateToString return values
2015-07-14 22:12:04 +00:00
parent ef77c116f3 b63b031cb5
commit 95f270de2f
1 changed files with 6 additions and 6 deletions
--- 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: