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

Commit de9f912d authored by Nate Myren's avatar Nate Myren Committed by Automerger Merge Worker
Browse files

Merge "Get fresh InProgress array in AttributedAppOp when adding/removing"... 

Merge "Get fresh InProgress array in AttributedAppOp when adding/removing" into sc-dev am: e904d48c

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

Change-Id: Iaed811f0eae15db5c835f06b201597e30a6036af
parents 45a790a4 e904d48c

services/core/java/com/android/server/appop/AppOpsService.java

+1 −0
Original line number Diff line number Diff line
@@ -1314,6 +1314,7 @@ public class AppOpsService extends IAppOpsService.Stub { 
                                    event.getAttributionFlags(), event.getAttributionChainId());

                        }



                        events = isRunning ? mInProgressEvents : mPausedInProgressEvents;

                        InProgressStartOpEvent newEvent = events.get(binders.get(i));

                        if (newEvent != null) {

                            newEvent.numUnfinishedStarts += numPreviousUnfinishedStarts - 1;