From da8f20e6bc75a6844df40ab7e41146b9ff75d179 Mon Sep 17 00:00:00 2001 From: Songchun Fan Date: Mon, 12 Oct 2020 13:34:20 -0700 Subject: [PATCH] [pm/incremental] use UID not user ID in the broadcasts The intent extra asks for UID not user ID. BUG: 165841645 Test: builds Change-Id: Ic1fd4edba8c5ba1b07efa3e3ef7cceda8caa7237 --- .../com/android/server/pm/PackageManagerService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 9caa91b63deee..805fbbc75a878 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -17269,13 +17269,13 @@ public class PackageManagerService extends IPackageManager.Stub private final PackageSetting mPackageSetting; private final String mPackageName; private final String mPathString; - private final int mUserId; + private final int mUid; private final int[] mInstalledUserIds; IncrementalStatesCallback(PackageSetting packageSetting, int userId) { mPackageSetting = packageSetting; mPackageName = packageSetting.name; - mUserId = userId; + mUid = UserHandle.getUid(userId, packageSetting.appId); mPathString = packageSetting.getPathString(); final int[] allUserIds = resolveUserIds(userId); final ArrayList installedUserIds = new ArrayList<>(); @@ -17311,7 +17311,7 @@ public class PackageManagerService extends IPackageManager.Stub ps, mInstalledUserIds, mSettings.mPackages); } Bundle extras = new Bundle(); - extras.putInt(Intent.EXTRA_UID, mUserId); + extras.putInt(Intent.EXTRA_UID, mUid); extras.putString(Intent.EXTRA_PACKAGE_NAME, mPackageName); sendPackageBroadcast(Intent.ACTION_PACKAGE_FULLY_LOADED, mPackageName, extras, 0 /*flags*/, @@ -17331,7 +17331,7 @@ public class PackageManagerService extends IPackageManager.Stub ps, mInstalledUserIds, mSettings.mPackages); } Bundle extras = new Bundle(); - extras.putInt(Intent.EXTRA_UID, mUserId); + extras.putInt(Intent.EXTRA_UID, mUid); extras.putString(Intent.EXTRA_PACKAGE_NAME, mPackageName); extras.putInt(Intent.EXTRA_REASON, reason); // send broadcast to users with this app installed @@ -17353,7 +17353,7 @@ public class PackageManagerService extends IPackageManager.Stub ps, mInstalledUserIds, mSettings.mPackages); } Bundle extras = new Bundle(); - extras.putInt(Intent.EXTRA_UID, mUserId); + extras.putInt(Intent.EXTRA_UID, mUid); extras.putString(Intent.EXTRA_PACKAGE_NAME, mPackageName); // send broadcast to users with this app installed sendPackageBroadcast(Intent.ACTION_PACKAGE_STARTABLE, mPackageName,