Merge "VolumeControl: Early return in unregisterCallback" into main (7ccc74f3) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothVolumeControl.java

+15 −13

Original line number	Diff line number	Diff line
		@@ -604,8 +604,11 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose
		}
		}

		if (!mCallbackExecutorMap.isEmpty()) {
		return;
		}

		// If the callback map is empty, we unregister the service-to-app callback
		if (mCallbackExecutorMap.isEmpty()) {
		try {
		final IBluetoothVolumeControl service = getService();
		if (service != null) {
		@@ -620,7 +623,6 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose
		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
		}
		}
		}

		/**
		* Tells the remote device to set a volume offset to the absolute volume.