| commit | de7b33df6e682842e42c8969a29cdd67e9a4e7e7 | [log] [tgz] |
|---|---|---|
| author | Garfield Tan <xutan@google.com> | Thu May 23 03:12:39 2024 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu May 23 03:12:39 2024 +0000 |
| tree | b0f6da2446e351a2ca0fdb505db5b5bbac799c6a | |
| parent | a27b11bd9883c7582e3086668bbd4fe1871e521f [diff] | |
| parent | 0fe1ce8740ecefb582a950066b004d1d957ec5f1 [diff] |
Merge "Guard potential bad clocks from moving backward" into main
diff --git a/services/core/java/com/android/server/appop/AttributedOp.java b/services/core/java/com/android/server/appop/AttributedOp.java index cc3efb0..8cf47d0 100644 --- a/services/core/java/com/android/server/appop/AttributedOp.java +++ b/services/core/java/com/android/server/appop/AttributedOp.java
@@ -651,7 +651,7 @@ accessEvents.append(makeKey(event.getUidState(), event.getFlags()), new AppOpsManager.NoteOpEvent(event.getStartTime(), - now - event.getStartElapsedTime(), + Math.max(now - event.getStartElapsedTime(), 0), event.getProxy())); } }