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

Copy pointer to sOnOpNotedCallback before queuing dispatch

Browse Source 
Test: Reproduce with attached test app
Fixes: 207324098
Change-Id: I9680c6f574d4355fcc5732c32e2287c5c1ccd4f2
This commit is contained in:
Evan Severson
2021-11-22 07:36:07 -08:00
parent ff3bb81a7e
commit 877ec88298
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/android/app/AppOpsManager.java
View File

@@ -9469,23 +9469,23 @@ public class AppOpsManager {
e.rethrowFromSystemServer();
}
if (missedAsyncOps != null) {
// Copy pointer so callback can be dispatched out of lock
OnOpNotedCallback onOpNotedCallback = sOnOpNotedCallback;
if (onOpNotedCallback != null && missedAsyncOps != null) {
int numMissedAsyncOps = missedAsyncOps.size();
for (int i = 0; i < numMissedAsyncOps; i++) {
final AsyncNotedAppOp asyncNotedAppOp = missedAsyncOps.get(i);
if (sOnOpNotedCallback != null) {
sOnOpNotedCallback.getAsyncNotedExecutor().execute(
() -> sOnOpNotedCallback.onAsyncNoted(asyncNotedAppOp));
}
onOpNotedCallback.getAsyncNotedExecutor().execute(
() -> onOpNotedCallback.onAsyncNoted(asyncNotedAppOp));
}
}
synchronized (this) {
int numMissedSyncOps = sUnforwardedOps.size();
for (int i = 0; i < numMissedSyncOps; i++) {
final AsyncNotedAppOp syncNotedAppOp = sUnforwardedOps.get(i);
if (sOnOpNotedCallback != null) {
sOnOpNotedCallback.getAsyncNotedExecutor().execute(
() -> sOnOpNotedCallback.onAsyncNoted(syncNotedAppOp));
if (onOpNotedCallback != null) {
for (int i = 0; i < numMissedSyncOps; i++) {
final AsyncNotedAppOp syncNotedAppOp = sUnforwardedOps.get(i);
onOpNotedCallback.getAsyncNotedExecutor().execute(
() -> onOpNotedCallback.onAsyncNoted(syncNotedAppOp));
}
}
sUnforwardedOps.clear();