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

Commit 53ac1c63 authored by Manjeet Rulhania's avatar Manjeet Rulhania Committed by Android (Google) Code Review
Browse files

Merge "Fix NoteOpEvent merging when reading discrete ops" into main

parents c7e9cca6 917f41e8

core/java/android/app/AppOpsManager.java

+2 −1
Original line number Diff line number Diff line
@@ -11013,7 +11013,8 @@ public class AppOpsManager { 


                if (access != null) {

                    NoteOpEvent existingAccess = accessEvents.get(key);

                    if (existingAccess == null || existingAccess.getDuration() == -1) {

                    if (existingAccess == null || existingAccess.getDuration() == -1

                            || existingAccess.getDuration() < access.getDuration()) {

                        accessEvents.append(key, access);

                    } else if (existingAccess.mProxy == null && access.mProxy != null ) {

                        existingAccess.mProxy = access.mProxy;