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

2021-12-22 20:04:29 +00:00
parent 291f266c99 f14e212d82
commit e904d48c7e
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -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;