| commit | 49303ee70cecce8fa95040eafd3a0c4b4695b51c | [log] [tgz] |
|---|---|---|
| author | Vinit Deshpande <vinitd@google.com> | Thu Apr 16 02:36:02 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 16 02:36:53 2015 +0000 |
| tree | fd323a5bf0a7af907f597a6cef39c7498a551d16 | |
| parent | 209195671e0bc70982991a879bd51965d3c43542 [diff] | |
| parent | 03d9e474e333620920b3c5c069cb45967ac4da6e [diff] |
Merge "am 463899f..97dde46 from mirror-m-wireless-internal-release"
diff --git a/Common/src/com/googlecode/android_scripting/facade/tele/TelecomManagerFacade.java b/Common/src/com/googlecode/android_scripting/facade/tele/TelecomManagerFacade.java index f5dc5fd..a5f3f95 100644 --- a/Common/src/com/googlecode/android_scripting/facade/tele/TelecomManagerFacade.java +++ b/Common/src/com/googlecode/android_scripting/facade/tele/TelecomManagerFacade.java
@@ -287,8 +287,6 @@ r = AudioState.ROUTE_SPEAKER; } else if (route == "WIRED_HEADSET") { r = AudioState.ROUTE_WIRED_HEADSET; - } else if (route == "ALL") { - r = AudioState.ROUTE_ALL; } else if (route == "WIRED_OR_EARPIECE") { r = AudioState.ROUTE_WIRED_OR_EARPIECE; }
diff --git a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java b/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java index 250c4f4..b30aa76 100644 --- a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java +++ b/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java
@@ -229,8 +229,8 @@ private static JSONObject buildJsonAudioState(AudioState data) throws JSONException { JSONObject state = new JSONObject(); - state.put("isMuted", data.isMuted); - state.put("AudioRoute", AudioState.audioRouteToString(data.route)); + state.put("isMuted", data.isMuted()); + state.put("AudioRoute", AudioState.audioRouteToString(data.getRoute())); return state; }