Merge "Add AudioManager.setHearingAidDeviceConnectionState" am: c3e842fde8

am: 670ecc2279

Change-Id: I9a7a7712d750581cec4131489bca7071ad64ceee

media/java/android/media/AudioManager.java

@@ -3605,6 +3605,21 @@ public class AudioManager {
         }
     }
 
+     /**
+     * Indicate Hearing Aid connection state change.
+     * @param device Bluetooth device connected/disconnected
+     * @param state new connection state (BluetoothProfile.STATE_xxx)
+     * {@hide}
+     */
+    public void setHearingAidDeviceConnectionState(BluetoothDevice device, int state) {
+        final IAudioService service = getService();
+        try {
+            service.setHearingAidDeviceConnectionState(device, state);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
      /**
      * Indicate A2DP source or sink connection state change.
      * @param device Bluetooth device connected/disconnected

media/java/android/media/IAudioService.aidl

@@ -143,6 +143,8 @@ interface IAudioService {
     void setWiredDeviceConnectionState(int type, int state, String address, String name,
             String caller);
 
+    void setHearingAidDeviceConnectionState(in BluetoothDevice device, int state);
+
     int setBluetoothA2dpDeviceConnectionState(in BluetoothDevice device, int state, int profile);
 
     void handleBluetoothA2dpDeviceConfigChange(in BluetoothDevice device);

services/core/java/com/android/server/audio/AudioService.java

@@ -4104,6 +4104,11 @@ public class AudioService extends IAudioService.Stub
         }
     }
 
+    @Override
+    public void setHearingAidDeviceConnectionState(BluetoothDevice device, int state)
+    {
+    }
+
     public int setBluetoothA2dpDeviceConnectionState(BluetoothDevice device, int state, int profile)
     {
         return setBluetoothA2dpDeviceConnectionStateSuppressNoisyIntent(