Merge "DO NOT MERGE ANYWHERE" into cw-e-dev

2015-12-01 15:37:30 +00:00
parent 52bdf11583 dd976b1b0d
commit 085796bdf5
7 changed files with 103 additions and 12 deletions
--- a/telecomm/java/android/telecom/ConnectionService.java
+++ b/telecomm/java/android/telecom/ConnectionService.java
@@ -669,6 +669,7 @@ public abstract class ConnectionService extends Service {
                        request.getAccountHandle(),
                        connection.getState(),
                        connection.getConnectionCapabilities(),
+                        connection.getSupportedAudioRoutes(),
                        connection.getAddress(),
                        connection.getAddressPresentation(),
                        connection.getCallerDisplayName(),
@@ -1011,6 +1012,7 @@ public abstract class ConnectionService extends Service {
                    phoneAccountHandle,
                    connection.getState(),
                    connection.getConnectionCapabilities(),
+                    connection.getSupportedAudioRoutes(),
                    connection.getAddress(),
                    connection.getAddressPresentation(),
                    connection.getCallerDisplayName(),