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

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

Merge "Fix a serialization issue in sync op reporting" into sc-dev am: 6a483f4f 

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

Change-Id: Ia3c2f693eaca7e75b19d86a997f7c0e8f4c47bfd
parents dbf5c125 6a483f4f

core/java/android/app/AppOpsManager.java

+6 −6
Original line number Diff line number Diff line
@@ -9038,8 +9038,11 @@ public class AppOpsManager { 
     *

     * @hide

     */

    // TODO (b/186872903) Refactor how sync noted ops are propagaged.

    // TODO (b/186872903) Refactor how sync noted ops are propagated.

    public static void prefixParcelWithAppOpsIfNeeded(@NonNull Parcel p) {

        if (!isListeningForOpNotedInBinderTransaction()) {

            return;

        }

        final ArrayMap<String, ArrayMap<String, long[]>> notedAppOps =

                sAppOpsNotedInThisBinderTransaction.get();

        if (notedAppOps == null) {
@@ -9083,9 +9086,6 @@ public class AppOpsManager { 
        }



        final String myPackageName = ActivityThread.currentPackageName();

        if (myPackageName == null) {

            return;

        }



        synchronized (sLock) {

            for (int i = 0; i < packageCount; i++) {
@@ -9105,7 +9105,7 @@ public class AppOpsManager { 
                    final BitSet notedAppOps = BitSet.valueOf(rawNotedAppOps);

                    for (int code = notedAppOps.nextSetBit(0); code != -1;

                            code = notedAppOps.nextSetBit(code + 1)) {

                        if (myPackageName.equals(packageName)) {

                        if (Objects.equals(myPackageName, packageName)) {

                            if (sOnOpNotedCallback != null) {

                                sOnOpNotedCallback.onNoted(new SyncNotedAppOp(code,

                                        attributionTag, packageName));
@@ -9123,7 +9123,7 @@ public class AppOpsManager { 
                    }

                    for (int code = notedAppOps.nextSetBit(0); code != -1;

                            code = notedAppOps.nextSetBit(code + 1)) {

                        if (myPackageName.equals(packageName)) {

                        if (Objects.equals(myPackageName, packageName)) {

                            sMessageCollector.onNoted(new SyncNotedAppOp(code,

                                    attributionTag, packageName));

                        }