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

Merge "Use simpler delayed writing logic in RoleUserState."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-12-10 11:22:11 +00:00
committed by Android (Google) Code Review
parent 71c9bea9a8 bc5430850e
commit 348c897729
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
services/core/java/com/android/server/role/RoleUserState.java
View File

@@ -62,7 +62,6 @@ public class RoleUserState {
private static final String ROLES_FILE_NAME = "roles.xml";
private static final long WRITE_DELAY_MILLIS = 200;
private static final long MAX_WRITE_DELAY_MILLIS = 2000;
private static final String TAG_ROLES = "roles";
private static final String TAG_ROLE = "role";
@@ -92,7 +91,7 @@ public class RoleUserState {
private ArrayMap<String, ArraySet<String>> mRoles = new ArrayMap<>();
@GuardedBy("mLock")
private long mWritePendingSinceMillis;
private boolean mWriteScheduled;
@GuardedBy("mLock")
private boolean mDestroyed;
@@ -292,26 +291,11 @@ public class RoleUserState {
private void scheduleWriteFileLocked() {
throwIfDestroyedLocked();
long currentTimeMillis = System.currentTimeMillis();
long writeDelayMillis;
if (!mWriteHandler.hasMessagesOrCallbacks()) {
mWritePendingSinceMillis = currentTimeMillis;
writeDelayMillis = WRITE_DELAY_MILLIS;
} else {
mWriteHandler.removeCallbacksAndMessages(null);
long writePendingDurationMillis = currentTimeMillis - mWritePendingSinceMillis;
if (writePendingDurationMillis >= MAX_WRITE_DELAY_MILLIS) {
writeDelayMillis = 0;
} else {
long maxWriteDelayMillis = Math.max(MAX_WRITE_DELAY_MILLIS
- writePendingDurationMillis, 0);
writeDelayMillis = Math.min(WRITE_DELAY_MILLIS, maxWriteDelayMillis);
}
if (!mWriteScheduled) {
mWriteHandler.sendMessageDelayed(PooledLambda.obtainMessage(RoleUserState::writeFile,
this), WRITE_DELAY_MILLIS);
mWriteScheduled = true;
}
mWriteHandler.sendMessageDelayed(PooledLambda.obtainMessage(RoleUserState::writeFile, this),
writeDelayMillis);
Slog.i(LOG_TAG, "Scheduled writing roles.xml");
}
@WorkerThread
@@ -324,6 +308,8 @@ public class RoleUserState {
return;
}
mWriteScheduled = false;
version = mVersion;
packagesHash = mPackagesHash;
roles = snapshotRolesLocked();