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

Merge "Make timestamps used in AppOpsService consistent."

Browse Source
This commit is contained in:
Stanislav Zholnin
2019-12-03 16:00:14 +00:00
committed by Android (Google) Code Review
parent 5605a0fe11 5104a0f29c
commit 86de218596
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/appop/AppOpsService.java
View File

@@ -1115,6 +1115,7 @@ public class AppOpsService extends IAppOpsService.Stub {
// There is some actively running operation... need to find it
// and appropriately update its state.
final long now = System.currentTimeMillis();
final long nowElapsed = SystemClock.elapsedRealtime();
for (int i = uidState.pkgOps.size() - 1; i >= 0; i--) {
final Ops ops = uidState.pkgOps.valueAt(i);
for (int j = ops.size() - 1; j >= 0; j--) {
@@ -1136,7 +1137,7 @@ public class AppOpsService extends IAppOpsService.Stub {
featureOp.finished(now, duration, oldPendingState,
AppOpsManager.OP_FLAG_SELF);
// Start the op in the new state
featureOp.startRealtime = now;
featureOp.startRealtime = nowElapsed;
featureOp.started(now, newState, AppOpsManager.OP_FLAG_SELF);
}
}