Merge "Revert "Revert "Require user pass in a non-null BluetoothDevice ..."" into rvc-dev (8e5098e0) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothA2dp.java

+26 −8

Original line number	Diff line number	Diff line
		@@ -643,8 +643,9 @@ public final class BluetoothA2dp implements BluetoothProfile {
		@SystemApi
		@Nullable
		@RequiresPermission(Manifest.permission.BLUETOOTH)
		public BluetoothCodecStatus getCodecStatus(@Nullable BluetoothDevice device) {
		public BluetoothCodecStatus getCodecStatus(@NonNull BluetoothDevice device) {
		if (DBG) Log.d(TAG, "getCodecStatus(" + device + ")");
		verifyDeviceNotNull(device, "getCodecStatus");
		try {
		final IBluetoothA2dp service = getService();
		if (service != null && isEnabled()) {
		@@ -670,9 +671,14 @@ public final class BluetoothA2dp implements BluetoothProfile {
		*/
		@SystemApi
		@RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)
		public void setCodecConfigPreference(@Nullable BluetoothDevice device,
		@Nullable BluetoothCodecConfig codecConfig) {
		public void setCodecConfigPreference(@NonNull BluetoothDevice device,
		@NonNull BluetoothCodecConfig codecConfig) {
		if (DBG) Log.d(TAG, "setCodecConfigPreference(" + device + ")");
		verifyDeviceNotNull(device, "setCodecConfigPreference");
		if (codecConfig == null) {
		Log.e(TAG, "setCodecConfigPreference: Codec config can't be null");
		throw new IllegalArgumentException("codecConfig cannot be null");
		}
		try {
		final IBluetoothA2dp service = getService();
		if (service != null && isEnabled()) {
		@@ -695,8 +701,9 @@ public final class BluetoothA2dp implements BluetoothProfile {
		*/
		@SystemApi
		@RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)
		public void enableOptionalCodecs(@Nullable BluetoothDevice device) {
		public void enableOptionalCodecs(@NonNull BluetoothDevice device) {
		if (DBG) Log.d(TAG, "enableOptionalCodecs(" + device + ")");
		verifyDeviceNotNull(device, "enableOptionalCodecs");
		enableDisableOptionalCodecs(device, true);
		}

		@@ -709,8 +716,9 @@ public final class BluetoothA2dp implements BluetoothProfile {
		*/
		@SystemApi
		@RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)
		public void disableOptionalCodecs(@Nullable BluetoothDevice device) {
		public void disableOptionalCodecs(@NonNull BluetoothDevice device) {
		if (DBG) Log.d(TAG, "disableOptionalCodecs(" + device + ")");
		verifyDeviceNotNull(device, "disableOptionalCodecs");
		enableDisableOptionalCodecs(device, false);
		}

		@@ -750,7 +758,8 @@ public final class BluetoothA2dp implements BluetoothProfile {
		@SystemApi
		@RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
		@OptionalCodecsSupportStatus
		public int supportsOptionalCodecs(@Nullable BluetoothDevice device) {
		public int isOptionalCodecsSupported(@NonNull BluetoothDevice device) {
		verifyDeviceNotNull(device, "isOptionalCodecsSupported");
		try {
		final IBluetoothA2dp service = getService();
		if (service != null && isEnabled() && isValidDevice(device)) {
		@@ -775,7 +784,8 @@ public final class BluetoothA2dp implements BluetoothProfile {
		@SystemApi
		@RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
		@OptionalCodecsPreferenceStatus
		public int getOptionalCodecsEnabled(@Nullable BluetoothDevice device) {
		public int isOptionalCodecsEnabled(@NonNull BluetoothDevice device) {
		verifyDeviceNotNull(device, "isOptionalCodecsEnabled");
		try {
		final IBluetoothA2dp service = getService();
		if (service != null && isEnabled() && isValidDevice(device)) {
		@@ -800,8 +810,9 @@ public final class BluetoothA2dp implements BluetoothProfile {
		*/
		@SystemApi
		@RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)
		public void setOptionalCodecsEnabled(@Nullable BluetoothDevice device,
		public void setOptionalCodecsEnabled(@NonNull BluetoothDevice device,
		@OptionalCodecsPreferenceStatus int value) {
		verifyDeviceNotNull(device, "setOptionalCodecsEnabled");
		try {
		if (value != BluetoothA2dp.OPTIONAL_CODECS_PREF_UNKNOWN
		&& value != BluetoothA2dp.OPTIONAL_CODECS_PREF_DISABLED
		@@ -854,6 +865,13 @@ public final class BluetoothA2dp implements BluetoothProfile {
		return false;
		}

		private void verifyDeviceNotNull(BluetoothDevice device, String methodName) {
		if (device == null) {
		Log.e(TAG, methodName + ": device param is null");
		throw new IllegalArgumentException("Device cannot be null");
		}
		}

		private boolean isValidDevice(BluetoothDevice device) {
		if (device == null) return false;