Merge "Fix cleanup of dead GATT clients" am: 529ae49e6f am: 25a2c7c883 (626e2f53) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/gatt/GattService.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -305,6 +305,19 @@ public class GattService extends ProfileService {
		}
		}

		class ClientDeathRecipient implements IBinder.DeathRecipient {
		int mAppIf;

		public ClientDeathRecipient(int appIf) {
		mAppIf = appIf;
		}

		public void binderDied() {
		if (DBG) Log.d(TAG, "Binder is dead - unregistering client (" + mAppIf + ")!");
		unregisterClient(mAppIf);
		}
		}

		/**
		* Handlers for incoming service calls
		*/
		@@ -675,6 +688,7 @@ public class GattService extends ProfileService {
		if (app != null) {
		if (status == 0) {
		app.id = clientIf;
		app.linkToDeath(new ClientDeathRecipient(clientIf));
		} else {
		mClientMap.remove(uuid);
		}