Merge "Bass: Use API flag for hasMessagesOrCallbacks" into main (7c78c3bb) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/bass_client/BassClientService.java

+13 −3

Original line number	Diff line number	Diff line
		@@ -288,7 +288,7 @@ public class BassClientService extends ProfileService {
		break;
		}
		Handler handler = getOrCreateHandler(broadcastId);
		if (!handler.hasMessagesOrCallbacks()) {
		if (!hasAnyMessagesOrCallbacks(handler)) {
		mHandlers.remove(broadcastId);
		}
		}
		@@ -311,7 +311,7 @@ public class BassClientService extends ProfileService {
		}
		Handler handler = getOrCreateHandler(broadcastId);
		handler.removeMessages(msg);
		if (!handler.hasMessagesOrCallbacks()) {
		if (!hasAnyMessagesOrCallbacks(handler)) {
		mHandlers.remove(broadcastId);
		}
		}
		@@ -329,7 +329,7 @@ public class BassClientService extends ProfileService {
		Map.Entry<Integer, Handler> entry = iterator.next();
		Handler handler = entry.getValue();
		handler.removeMessages(msg);
		if (!handler.hasMessagesOrCallbacks()) {
		if (!hasAnyMessagesOrCallbacks(handler)) {
		iterator.remove();
		}
		}
		@@ -342,6 +342,16 @@ public class BassClientService extends ProfileService {
		Handler handler = getOrCreateHandler(broadcastId);
		return handler.hasMessages(msg);
		}

		private boolean hasAnyMessagesOrCallbacks(Handler handler) {
		if (android.os.Flags.mainlineVcnPlatformApi()) {
		return handler.hasMessagesOrCallbacks();
		} else {
		return handler.hasMessages(MESSAGE_SYNC_LOST_TIMEOUT)
		\|\| handler.hasMessages(MESSAGE_BROADCAST_MONITOR_TIMEOUT)
		\|\| handler.hasMessages(MESSAGE_BIG_MONITOR_TIMEOUT);
		}
		}
		}

		public BassClientService(Context ctx) {