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

Merge "[snapshot] use caches for arraylists in mAppIds" into tm-dev

Browse Source
This commit is contained in:
Songchun Fan
2022-05-05 00:38:25 +00:00
committed by Android (Google) Code Review
parent 1187757cf2 0d917af02b
commit 998d86cac1
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
services/core/java/com/android/server/pm/AppIdSettingMap.java
View File

@@ -19,6 +19,7 @@ package com.android.server.pm;
import android.os.Process; import android.os.Process;
import android.util.Log; import android.util.Log;
import com.android.server.utils.SnapshotCache;
import com.android.server.utils.WatchedArrayList; import com.android.server.utils.WatchedArrayList;
import com.android.server.utils.WatchedSparseArray; import com.android.server.utils.WatchedSparseArray;
import com.android.server.utils.Watcher; import com.android.server.utils.Watcher;
@@ -34,10 +35,28 @@ final class AppIdSettingMap {
* index to the corresponding SettingBase object is (appId - FIRST_APPLICATION_ID). If an app ID * index to the corresponding SettingBase object is (appId - FIRST_APPLICATION_ID). If an app ID
* doesn't exist (i.e., app is not installed), we fill the corresponding entry with null. * doesn't exist (i.e., app is not installed), we fill the corresponding entry with null.
*/ */
private WatchedArrayList<SettingBase> mNonSystemSettings = new WatchedArrayList<>(); private final WatchedArrayList<SettingBase> mNonSystemSettings;
private WatchedSparseArray<SettingBase> mSystemSettings = new WatchedSparseArray<>(); private final SnapshotCache<WatchedArrayList<SettingBase>> mNonSystemSettingsSnapshot;
private final WatchedSparseArray<SettingBase> mSystemSettings;
private final SnapshotCache<WatchedSparseArray<SettingBase>> mSystemSettingsSnapshot;
private int mFirstAvailableAppId = Process.FIRST_APPLICATION_UID; private int mFirstAvailableAppId = Process.FIRST_APPLICATION_UID;
AppIdSettingMap() {
mNonSystemSettings = new WatchedArrayList<>();
mNonSystemSettingsSnapshot = new SnapshotCache.Auto<>(
mNonSystemSettings, mNonSystemSettings, "AppIdSettingMap.mNonSystemSettings");
mSystemSettings = new WatchedSparseArray<>();
mSystemSettingsSnapshot = new SnapshotCache.Auto<>(
mSystemSettings, mSystemSettings, "AppIdSettingMap.mSystemSettings");
}
AppIdSettingMap(AppIdSettingMap orig) {
mNonSystemSettings = orig.mNonSystemSettingsSnapshot.snapshot();
mNonSystemSettingsSnapshot = new SnapshotCache.Sealed<>();
mSystemSettings = orig.mSystemSettingsSnapshot.snapshot();
mSystemSettingsSnapshot = new SnapshotCache.Sealed<>();
}
/** Returns true if the requested AppID was valid and not already registered. */ /** Returns true if the requested AppID was valid and not already registered. */
public boolean registerExistingAppId(int appId, SettingBase setting, Object name) { public boolean registerExistingAppId(int appId, SettingBase setting, Object name) {
if (appId >= Process.FIRST_APPLICATION_UID) { if (appId >= Process.FIRST_APPLICATION_UID) {
@@ -134,10 +153,7 @@ final class AppIdSettingMap {
} }
public AppIdSettingMap snapshot() { public AppIdSettingMap snapshot() {
AppIdSettingMap l = new AppIdSettingMap(); return new AppIdSettingMap(this);
mNonSystemSettings.snapshot(l.mNonSystemSettings, mNonSystemSettings);
mSystemSettings.snapshot(l.mSystemSettings, mSystemSettings);
return l;
} }
public void registerObserver(Watcher observer) { public void registerObserver(Watcher observer) {