Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[pm/incremental] use UID not user ID in the broadcasts

Browse Source 
The intent extra asks for UID not user ID.

BUG: 165841645
Test: builds
Change-Id: Ic1fd4edba8c5ba1b07efa3e3ef7cceda8caa7237
This commit is contained in:
Songchun Fan
2020-10-12 13:34:20 -07:00
parent 83b1d263a9
commit da8f20e6bc
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -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<Integer> 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,