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

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

Change-Id: I412180b7b17951fdb860b1df0e7b1617b7fcb2a3

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;