Merge "Add AudioManager.setHearingAidDeviceConnectionState" am: c3e842fde8 am: 670ecc2279 (13956ba9) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioManager.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -3912,6 +3912,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

+2 −0

Original line number	Diff line number	Diff line
		@@ -151,6 +151,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);

+5 −0

Original line number	Diff line number	Diff line
		@@ -4221,6 +4221,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(