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

Commit ecb45f7e authored by Stanislav Zholnin's avatar Stanislav Zholnin
Browse files

Fix issues with getHistoricalOps() results overflowing Binder connection. 

Test: manually tested.
Bug: 186193371
Change-Id: I391cb36a86308c89056965a47596707257a2a0af
parent 0f314d68

core/java/android/app/AppOpsManager.java

+7 −20
Original line number Diff line number Diff line
@@ -6844,7 +6844,7 @@ public class AppOpsManager { 
            writeLongSparseLongArrayToParcel(mAccessCount, parcel);

            writeLongSparseLongArrayToParcel(mRejectCount, parcel);

            writeLongSparseLongArrayToParcel(mAccessDuration, parcel);

            writeDiscreteAccessArrayToParcel(mDiscreteAccesses, parcel);

            writeDiscreteAccessArrayToParcel(mDiscreteAccesses, parcel, flags);

        }



        @Override
@@ -9696,29 +9696,16 @@ public class AppOpsManager { 
    }



    private static void writeDiscreteAccessArrayToParcel(

            @Nullable List<AttributedOpEntry> array, @NonNull Parcel parcel) {

        if (array != null) {

            final int size = array.size();

            parcel.writeInt(size);

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

                array.get(i).writeToParcel(parcel, 0);

            }

        } else {

            parcel.writeInt(-1);

        }

            @Nullable List<AttributedOpEntry> array, @NonNull Parcel parcel, int flags) {

        ParceledListSlice<AttributedOpEntry> listSlice =

                array == null ? null : new ParceledListSlice<>(array);

        parcel.writeParcelable(listSlice, flags);

    }



    private static @Nullable List<AttributedOpEntry> readDiscreteAccessArrayFromParcel(

            @NonNull Parcel parcel) {

        final int size = parcel.readInt();

        if (size < 0) {

            return null;

        }

        final List<AttributedOpEntry> array = new ArrayList<>(size);

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

            array.add(new AttributedOpEntry(parcel));

        }

        return array;

        final ParceledListSlice<AttributedOpEntry> listSlice = parcel.readParcelable(null);

        return listSlice == null ? null : listSlice.getList();

    }



    /**