Merge "[pm] fix acquireAndRegisterNewAppId after app removal" into tm-dev am: 663a7ae5ce

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16992064

Change-Id: I4a7243d151939560cdbd0a01eb7f8daa61b84421
This commit is contained in:
Songchun Fan
2022-03-03 01:24:54 +00:00
committed by Automerger Merge Worker

View File

@@ -410,7 +410,7 @@ public final class Settings implements Watchable, Snappable {
int[] excludedUserIds;
}
private static int mFirstAvailableUid = 0;
private static int mFirstAvailableUid = Process.FIRST_APPLICATION_UID;
/** Map from volume UUID to {@link VersionInfo} */
@Watched
@@ -4275,7 +4275,7 @@ public final class Settings implements Watchable, Snappable {
private int acquireAndRegisterNewAppIdLPw(SettingBase obj) {
// Let's be stupidly inefficient for now...
final int size = mAppIds.size();
for (int i = mFirstAvailableUid; i < size; i++) {
for (int i = mFirstAvailableUid - Process.FIRST_APPLICATION_UID; i < size; i++) {
if (mAppIds.get(i) == null) {
mAppIds.set(i, obj);
return Process.FIRST_APPLICATION_UID + i;