Merge "A2dpSinkService enforces BLUETOOTH_PRIVILEGED permission for... (11a487ed) · Commits · e / os / android_packages_apps_Bluetooth

src/com/android/bluetooth/a2dpsink/A2dpSinkService.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -328,7 +328,8 @@ public class A2dpSinkService extends ProfileService {
		* @return true if connectionPolicy is set, false on error
		*/
		public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {
		enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");
		enforceCallingOrSelfPermission(
		BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");
		if (DBG) {
		Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);
		}
		@@ -349,7 +350,8 @@ public class A2dpSinkService extends ProfileService {
		* @return connection policy of the specified device
		*/
		public int getConnectionPolicy(BluetoothDevice device) {
		enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");
		enforceCallingOrSelfPermission(
		BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");
		return AdapterService.getAdapterService().getDatabase()
		.getProfileConnectionPolicy(device, BluetoothProfile.A2DP_SINK);
		}
		@@ -376,7 +378,8 @@ public class A2dpSinkService extends ProfileService {
		}

		boolean isA2dpPlaying(BluetoothDevice device) {
		enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
		enforceCallingOrSelfPermission(
		BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");
		return mA2dpSinkStreamHandler.isPlaying();
		}