Merge "Fix unregAll throwing Concurrent exception" am: 6741f1482d (31fe82d9) · Commits · e / os / android_packages_modules_Bluetooth

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

+13 −1

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ import com.android.bluetooth.btservice.BluetoothProto;
		}

		/** Our internal application list */
		List<App> mApps = new ArrayList<App>();
		private List<App> mApps = new ArrayList<App>();

		/** Internal map to keep track of logging information by app name */
		HashMap<String, AppScanStats> mAppScanStats = new HashMap<String, AppScanStats>();
		@@ -199,6 +199,18 @@ import com.android.bluetooth.btservice.BluetoothProto;
		}
		}

		List<Integer> getAllAppsIds() {
		List<Integer> appIds = new ArrayList();
		synchronized (mApps) {
		Iterator<App> i = mApps.iterator();
		while (i.hasNext()) {
		App entry = i.next();
		appIds.add(entry.id);
		}
		}
		return appIds;
		}

		/**
		* Add a new connection for a given application ID.
		*/

+3 −3

Original line number	Diff line number	Diff line
		@@ -1482,9 +1482,9 @@ public class GattService extends ProfileService {
		}

		void unregAll() {
		for(ClientMap.App app:mClientMap.mApps){
		if (DBG) Log.d(TAG, "unreg:" + app.id);
		unregisterClient(app.id);
		for (Integer appId : mClientMap.getAllAppsIds()) {
		if (DBG) Log.d(TAG, "unreg:" + appId);
		unregisterClient(appId);
		}
		}