Merge "[CDM] Add a lock for package callbacks" into main (f7094d5f) · Commits · e / os / android_frameworks_base

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+14 −4

Original line number	Diff line number	Diff line
		@@ -137,6 +137,8 @@ public class CompanionDeviceManagerService extends SystemService {
		private final DisassociationProcessor mDisassociationProcessor;
		private final CrossDeviceSyncController mCrossDeviceSyncController;

		private final Object mPackageLock = new Object();

		public CompanionDeviceManagerService(Context context) {
		super(context);

		@@ -784,23 +786,31 @@ public class CompanionDeviceManagerService extends SystemService {
		private final PackageMonitor mPackageMonitor = new PackageMonitor() {
		@Override
		public void onPackageRemoved(String packageName, int uid) {
		synchronized (mPackageLock) {
		onPackageRemoveOrDataClearedInternal(getChangingUserId(), packageName);
		}
		}

		@Override
		public void onPackageDataCleared(String packageName, int uid) {
		synchronized (mPackageLock) {
		onPackageRemoveOrDataClearedInternal(getChangingUserId(), packageName);
		}
		}

		@Override
		public void onPackageModified(@NonNull String packageName) {
		synchronized (mPackageLock) {
		onPackageModifiedInternal(getChangingUserId(), packageName);
		}
		}

		@Override
		public void onPackageAdded(String packageName, int uid) {
		synchronized (mPackageLock) {
		onPackageAddedInternal(getChangingUserId(), packageName);
		}
		}
		};

		private class LocalService implements CompanionDeviceManagerServiceInternal {