Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ead3a3ab authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I10c7803e3bc81cae9577504b58d2c608b1fd0de7
parents bb6a6dbd 7ec25249

core/java/android/app/AppOpsManager.java

+7 −4
Original line number Diff line number Diff line
@@ -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();