diff options
| author | 2024-02-06 23:11:53 +0000 | |
|---|---|---|
| committer | 2024-02-06 23:11:53 +0000 | |
| commit | 4b4607c34fa43e9c7a33f6950ae2e676ef5efbc8 (patch) | |
| tree | 1154cf81252570fdca99e5d06862428c82ea627a | |
| parent | cde990a358fff362cc3f6a3965a51e839dab5d60 (diff) | |
| parent | dda33d5b76ac54153d9ded523d2603f08a44b457 (diff) | |
Merge "Amend typo for AppOpsManager" into main am: dda33d5b76
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2951229
Change-Id: I2ea380d94e3cae655fc3ca9a27e5f15799abf117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/app/AppOpsManager.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index 4b24b1f2b2a1..f78072d35220 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -4504,19 +4504,19 @@ public class AppOpsManager { */ private @Nullable NoteOpEvent getLastRejectEvent(@UidState int fromUidState, @UidState int toUidState, @OpFlags int flags) { - NoteOpEvent lastAccessEvent = null; + NoteOpEvent lastRejectEvent = null; for (AttributedOpEntry attributionEntry : mAttributedOpEntries.values()) { - NoteOpEvent lastAttributionAccessEvent = attributionEntry.getLastRejectEvent( + NoteOpEvent lastAttributionRejectEvent = attributionEntry.getLastRejectEvent( fromUidState, toUidState, flags); - if (lastAccessEvent == null || (lastAttributionAccessEvent != null - && lastAttributionAccessEvent.getNoteTime() - > lastAccessEvent.getNoteTime())) { - lastAccessEvent = lastAttributionAccessEvent; + if (lastRejectEvent == null || (lastAttributionRejectEvent != null + && lastAttributionRejectEvent.getNoteTime() + > lastRejectEvent.getNoteTime())) { + lastRejectEvent = lastAttributionRejectEvent; } } - return lastAccessEvent; + return lastRejectEvent; } /** |