Merge "Handle user removed for PackageMonitorCallbackHelper" into main (9f78925f) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageManagerService.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -4299,6 +4299,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService
		mAppsFilter.onUserDeleted(snapshotComputer(), userId);
		}
		mInstantAppRegistry.onUserRemoved(userId);
		mPackageMonitorCallbackHelper.onUserRemoved(userId);
		}

		/**

+15 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,21 @@ class PackageMonitorCallbackHelper {
		}
		}

		public void onUserRemoved(int userId) {
		RemoteCallbackList<IRemoteCallback> callbacks;
		synchronized (mLock) {
		callbacks = mCallbacks;
		}
		int registerCount = callbacks.getRegisteredCallbackCount();
		for (int i = 0; i < registerCount; i++) {
		int registerUserId = (int) callbacks.getRegisteredCallbackCookie(i);
		if (registerUserId == userId) {
		IRemoteCallback callback = callbacks.getRegisteredCallbackItem(i);
		unregisterPackageMonitorCallback(callback);
		}
		}
		}

		public void notifyPackageAddedForNewUsers(String packageName,
		@AppIdInt int appId, @NonNull int[] userIds, @NonNull int[] instantUserIds,
		int dataLoaderType) {