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

Merge "[pm] fix acquireAndRegisterNewAppId after app removal" into tm-dev

Browse Source
This commit is contained in:
Songchun Fan
2022-03-03 01:22:12 +00:00
committed by Android (Google) Code Review
parent 16fc7aa4f5 9f06a92fa9
commit 663a7ae5ce
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; int[] excludedUserIds;
} }
private static int mFirstAvailableUid = 0; private static int mFirstAvailableUid = Process.FIRST_APPLICATION_UID;
/** Map from volume UUID to {@link VersionInfo} */ /** Map from volume UUID to {@link VersionInfo} */
@Watched @Watched
@@ -4275,7 +4275,7 @@ public final class Settings implements Watchable, Snappable {
private int acquireAndRegisterNewAppIdLPw(SettingBase obj) { private int acquireAndRegisterNewAppIdLPw(SettingBase obj) {
// Let's be stupidly inefficient for now... // Let's be stupidly inefficient for now...
final int size = mAppIds.size(); 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) { if (mAppIds.get(i) == null) {
mAppIds.set(i, obj); mAppIds.set(i, obj);
return Process.FIRST_APPLICATION_UID + i; return Process.FIRST_APPLICATION_UID + i;