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

Merge changes I652a101f,Ie0813053

Browse Source 
* changes:
  Increase the default period to allow for more async writes.
  Further async settings write optimizations.
This commit is contained in:
TreeHugger Robot
2022-12-05 16:38:09 +00:00
committed by Android (Google) Code Review
parent 19bb68b683 f0bbf0d668
commit 40f2e1a49d
1 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
services/core/java/com/android/server/pm/Settings.java
View File

@@ -5594,8 +5594,8 @@ public final class Settings implements Watchable, Snappable {
}
private static final class RuntimePermissionPersistence {
// 200-400ms delay to avoid monopolizing PMS lock when written for multiple users.
private static final long WRITE_PERMISSIONS_DELAY_MILLIS = 300;
// 700-1300ms delay to avoid monopolizing PMS lock when written for multiple users.
private static final long WRITE_PERMISSIONS_DELAY_MILLIS = 1000;
private static final double WRITE_PERMISSIONS_DELAY_JITTER = 0.3;
private static final long MAX_WRITE_PERMISSIONS_DELAY_MILLIS = 2000;
@@ -5613,8 +5613,7 @@ public final class Settings implements Watchable, Snappable {
// Low-priority handlers running on SystemBg thread.
private final Handler mAsyncHandler = new MyHandler();
private final Handler mPersistenceHandler = new Handler(
BackgroundThread.getHandler().getLooper());
private final Handler mPersistenceHandler = new PersistenceHandler();
private final Object mLock = new Object();
@@ -5761,20 +5760,22 @@ public final class Settings implements Watchable, Snappable {
@NonNull WatchedArrayMap<String, SharedUserSetting> sharedUsers,
@Nullable Handler pmHandler, @NonNull Object pmLock,
boolean sync) {
final int version;
final String fingerprint;
final boolean isLegacyPermissionStateStale;
synchronized (mLock) {
mAsyncHandler.removeMessages(userId);
mWriteScheduled.delete(userId);
version = mVersions.get(userId, INITIAL_VERSION);
fingerprint = mFingerprints.get(userId);
isLegacyPermissionStateStale = mIsLegacyPermissionStateStale;
mIsLegacyPermissionStateStale = false;
}
Runnable writer = () -> {
final int version;
final String fingerprint;
final boolean isLegacyPermissionStateStale;
synchronized (mLock) {
version = mVersions.get(userId, INITIAL_VERSION);
fingerprint = mFingerprints.get(userId);
isLegacyPermissionStateStale = mIsLegacyPermissionStateStale;
mIsLegacyPermissionStateStale = false;
}
final RuntimePermissionsState runtimePermissions;
synchronized (pmLock) {
if (sync || isLegacyPermissionStateStale) {
@@ -5823,7 +5824,7 @@ public final class Settings implements Watchable, Snappable {
}
if (pmHandler != null) {
// Async version.
mPersistenceHandler.post(() -> writePendingStates());
mPersistenceHandler.obtainMessage(userId).sendToTarget();
} else {
// Sync version.
writePendingStates();
@@ -6099,6 +6100,17 @@ public final class Settings implements Watchable, Snappable {
}
}
}
private final class PersistenceHandler extends Handler {
PersistenceHandler() {
super(BackgroundThread.getHandler().getLooper());
}
@Override
public void handleMessage(Message message) {
writePendingStates();
}
}
}
/**