Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b4607c3 authored by Hai Zhang's avatar Hai Zhang Committed by Automerger Merge Worker
Browse files

Merge "Amend typo for AppOpsManager" into main am: dda33d5b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2951229



Change-Id: I2ea380d94e3cae655fc3ca9a27e5f15799abf117
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cde990a3 dda33d5b

core/java/android/app/AppOpsManager.java

+7 −7
Original line number Diff line number Diff line
@@ -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;

        }



        /**