Merge "Fix unregAll throwing Concurrent exception" (f0c2aaa3) · Commits · e / os / android_packages_modules_Bluetooth

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

+13 −1

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

	/** Our internal application list */		/** 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 */		/** Internal map to keep track of logging information by app name */
	HashMap<String, AppScanStats> mAppScanStats = new HashMap<String, AppScanStats>();		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.		* Add a new connection for a given application ID.
	*/		*/

+3 −3

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

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