diff options
| author | 2018-06-19 19:20:28 +0000 | |
|---|---|---|
| committer | 2018-06-19 19:20:28 +0000 | |
| commit | 4cedfca842ece54d022260eab49b2d4920309b27 (patch) | |
| tree | 0e4559fe39eb1b453ecbc8f5907b67bf81e0e445 | |
| parent | 54d5994902e6ad085958f58040e7332bc18d0af1 (diff) | |
| parent | 9fb9350e49154e3677b37ee64a0f3b9087d25443 (diff) | |
Merge "Change app ops state timeouts to elapsed realtime"
| -rw-r--r-- | services/core/java/com/android/server/AppOpsService.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/AppOpsService.java b/services/core/java/com/android/server/AppOpsService.java index 786d757557d1..1167e1d41a9c 100644 --- a/services/core/java/com/android/server/AppOpsService.java +++ b/services/core/java/com/android/server/AppOpsService.java @@ -198,7 +198,7 @@ public class AppOpsService extends IAppOpsService.Stub { @VisibleForTesting final SparseArray<UidState> mUidStates = new SparseArray<>(); - long mLastUptime; + long mLastRealtime; /* * These are app op restrictions imposed per user from various parties. @@ -770,7 +770,7 @@ public class AppOpsService extends IAppOpsService.Stub { } else { settleTime = mConstants.BG_STATE_SETTLE_TIME; } - uidState.pendingStateCommitTime = SystemClock.uptimeMillis() + settleTime; + uidState.pendingStateCommitTime = SystemClock.elapsedRealtime() + settleTime; } if (uidState.startNesting != 0) { // There is some actively running operation... need to find it @@ -1881,11 +1881,11 @@ public class AppOpsService extends IAppOpsService.Stub { mUidStates.put(uid, uidState); } else { if (uidState.pendingStateCommitTime != 0) { - if (uidState.pendingStateCommitTime < mLastUptime) { + if (uidState.pendingStateCommitTime < mLastRealtime) { commitUidPendingStateLocked(uidState); } else { - mLastUptime = SystemClock.uptimeMillis(); - if (uidState.pendingStateCommitTime < mLastUptime) { + mLastRealtime = SystemClock.elapsedRealtime(); + if (uidState.pendingStateCommitTime < mLastRealtime) { commitUidPendingStateLocked(uidState); } } @@ -3284,7 +3284,7 @@ public class AppOpsService extends IAppOpsService.Stub { } if (uidState.pendingStateCommitTime != 0) { pw.print(" pendingStateCommitTime="); - TimeUtils.formatDuration(uidState.pendingStateCommitTime, nowUptime, pw); + TimeUtils.formatDuration(uidState.pendingStateCommitTime, nowElapsed, pw); pw.println(); } if (uidState.startNesting != 0) { |