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

[pm] fix missing PACKAGE_CHANGED broadcasts

Browse Source 
A regression was introduced during refactoring where we used numUsers as
the size of the pending broadcasts. This caused some pending broadcasts
to be neglected.

Test: manually verified that SetUpWizard broadcasts were sent as
expected.
BUG: 233363816

Change-Id: I8f194f15971597593a9b022f2d5937cd519a30cb
This commit is contained in:
Songchun Fan
2022-06-05 14:05:58 -07:00
parent 08a70e40fb
commit 8b4354e6d2
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/core/java/com/android/server/pm/InstallPackageHelper.java
View File

@@ -2548,28 +2548,31 @@ final class InstallPackageHelper {
public void sendPendingBroadcasts() {
String[] packages;
ArrayList<String>[] components;
int size = 0;
int numBroadcasts = 0, numUsers;
int[] uids;
synchronized (mPm.mLock) {
final SparseArray<ArrayMap<String, ArrayList<String>>> userIdToPackagesToComponents =
mPm.mPendingBroadcasts.copiedMap();
size = userIdToPackagesToComponents.size();
if (size <= 0) {
numUsers = userIdToPackagesToComponents.size();
for (int n = 0; n < numUsers; n++) {
numBroadcasts += userIdToPackagesToComponents.valueAt(n).size();
}
if (numBroadcasts == 0) {
// Nothing to be done. Just return
return;
}
packages = new String[size];
components = new ArrayList[size];
uids = new int[size];
packages = new String[numBroadcasts];
components = new ArrayList[numBroadcasts];
uids = new int[numBroadcasts];
int i = 0; // filling out the above arrays
for (int n = 0; n < size; n++) {
for (int n = 0; n < numUsers; n++) {
final int packageUserId = userIdToPackagesToComponents.keyAt(n);
final ArrayMap<String, ArrayList<String>> componentsToBroadcast =
userIdToPackagesToComponents.valueAt(n);
final int numComponents = CollectionUtils.size(componentsToBroadcast);
for (int index = 0; i < size && index < numComponents; index++) {
for (int index = 0; index < numComponents; index++) {
packages[i] = componentsToBroadcast.keyAt(index);
components[i] = componentsToBroadcast.valueAt(index);
final PackageSetting ps = mPm.mSettings.getPackageLPr(packages[i]);
@@ -2579,12 +2582,12 @@ final class InstallPackageHelper {
i++;
}
}
size = i;
numBroadcasts = i;
mPm.mPendingBroadcasts.clear();
}
final Computer snapshot = mPm.snapshotComputer();
// Send broadcasts
for (int i = 0; i < size; i++) {
for (int i = 0; i < numBroadcasts; i++) {
mPm.sendPackageChangedBroadcast(snapshot, packages[i], true /* dontKillApp */,
components[i], uids[i], null /* reason */);
}