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

Commit d5e671c2 authored by Nate Myren's avatar Nate Myren Committed by Automerger Merge Worker
Browse files

Merge "[Binder][XIAOMI][Bugfix] Skip appops header in native parcel. [1/2]"... 

Merge "[Binder][XIAOMI][Bugfix] Skip appops header in native parcel. [1/2]" into main am: 75844136 am: 1b0e8d09

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



Change-Id: Ia2c1fb17c746a570c6a16be320774ca088c654fa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4f5b9059 1b0e8d09

core/java/android/app/AppOpsManager.java

+11 −0
Original line number Diff line number Diff line
@@ -10153,6 +10153,9 @@ public class AppOpsManager { 
        }



        p.writeInt(Parcel.EX_HAS_NOTED_APPOPS_REPLY_HEADER);

        final int sizePosition = p.dataPosition();

        // Write size placeholder. With this size we can easily skip it in native.

        p.writeInt(0);



        int numAttributionWithNotesAppOps = notedAppOps.size();

        p.writeInt(numAttributionWithNotesAppOps);
@@ -10169,6 +10172,12 @@ public class AppOpsManager { 
                }

            }

        }



        final int payloadPosition = p.dataPosition();

        p.setDataPosition(sizePosition);

        // Total header size including 4 bytes size itself.

        p.writeInt(payloadPosition - sizePosition);

        p.setDataPosition(payloadPosition);

    }



    /**
@@ -10182,6 +10191,8 @@ public class AppOpsManager { 
     * @hide

     */

    public static void readAndLogNotedAppops(@NonNull Parcel p) {

        // Skip size.

        p.readInt();

        int numAttributionsWithNotedAppOps = p.readInt();



        for (int i = 0; i < numAttributionsWithNotedAppOps; i++) {