Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get fresh InProgress array in AttributedAppOp when adding/removing

Browse Source 
Otherwise, a call to finish() and then start() might reallocate the
array, and cause the reference to point to the old location of the
array.

Fixes: 208662370
Test: atest ForegroundModeAndActiveTest
Change-Id: I7e754c067520765c00cc67cc310926e63bd0462d
Merged-In: I7e754c067520765c00cc67cc310926e63bd0462d
This commit is contained in:
Nate Myren
2021-12-01 15:15:47 -08:00
parent c821fffecb
commit e5e4a8df8c
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/appop/AppOpsService.java
View File

@@ -1314,6 +1314,7 @@ public class AppOpsService extends IAppOpsService.Stub {
event.getAttributionFlags(), event.getAttributionChainId()); event.getAttributionFlags(), event.getAttributionChainId());
} }
events = isRunning ? mInProgressEvents : mPausedInProgressEvents;
InProgressStartOpEvent newEvent = events.get(binders.get(i)); InProgressStartOpEvent newEvent = events.get(binders.get(i));
if (newEvent != null) { if (newEvent != null) {
newEvent.numUnfinishedStarts += numPreviousUnfinishedStarts - 1; newEvent.numUnfinishedStarts += numPreviousUnfinishedStarts - 1;