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

Merge "Save AsyncOps for later forwarding instead of SyncOps." into rvc-dev am: 7ec25249ab am: 4b94dff328

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

Change-Id: Ic25d52cb8e8a973e66d41499185a123c8d621291
This commit is contained in:
TreeHugger Robot
2020-06-19 22:02:28 +00:00
committed by Automerger Merge Worker
parent 3712df59f7 4b94dff328
commit b41ace7709
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -227,7 +227,7 @@ public class AppOpsManager {
* {@link #sMessageCollector}, which forces {@link COLLECT_SYNC} mode.
*/
@GuardedBy("sLock")
private static ArrayList<SyncNotedAppOp> sUnforwardedOps = new ArrayList<>();
private static ArrayList<AsyncNotedAppOp> sUnforwardedOps = new ArrayList<>();
/**
* Additional collector that collect accesses and forwards a few of them them via
@@ -8195,7 +8195,10 @@ public class AppOpsManager {
if (sOnOpNotedCallback != null) {
sOnOpNotedCallback.onNoted(new SyncNotedAppOp(code, attributionTag));
} else {
sUnforwardedOps.add(new SyncNotedAppOp(code, attributionTag));
String message = getFormattedStackTrace();
sUnforwardedOps.add(
new AsyncNotedAppOp(code, Process.myUid(), attributionTag,
message, System.currentTimeMillis()));
if (sUnforwardedOps.size() > MAX_UNFORWARDED_OPS) {
sUnforwardedOps.remove(0);
}
@@ -8268,10 +8271,10 @@ public class AppOpsManager {
synchronized (this) {
int numMissedSyncOps = sUnforwardedOps.size();
for (int i = 0; i < numMissedSyncOps; i++) {
final SyncNotedAppOp syncNotedAppOp = sUnforwardedOps.get(i);
final AsyncNotedAppOp syncNotedAppOp = sUnforwardedOps.get(i);
if (sOnOpNotedCallback != null) {
sOnOpNotedCallback.getAsyncNotedExecutor().execute(
() -> sOnOpNotedCallback.onNoted(syncNotedAppOp));
() -> sOnOpNotedCallback.onAsyncNoted(syncNotedAppOp));
}
}
sUnforwardedOps.clear();