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

[pm] fix acquireAndRegisterNewAppId after app removal

Browse Source 
mFirstAvailableUid becomes (the last removed app ID + 1) after an app
removal. acquireAndRegisterNewAppId should use the offset of
mFirstAvailableUid as an index, not its actual value.

Test: manual for now
BUG: 216658672
Change-Id: Ie1b9ecafeb191129320243608c7f70eb2ea5c79e
This commit is contained in:
Songchun Fan
2022-02-23 20:09:35 +00:00
parent 9492d508d8
commit 9f06a92fa9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/Settings.java
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
@@ -4271,7 +4271,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;