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

Commit d3c3628a authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix Unsafe Parcel Usage" into main

parents 5efa5630 3e7263f9

core/java/android/app/admin/ComponentNamePolicyValue.java

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ public final class ComponentNamePolicyValue extends PolicyValue<ComponentName> { 
    }



    private ComponentNamePolicyValue(Parcel source) {

        this((ComponentName) source.readParcelable(ComponentName.class.getClassLoader()));

        this(source.readParcelable(ComponentName.class.getClassLoader(), ComponentName.class));

    }



    @Override

core/java/android/app/admin/DevicePolicyState.java

+4 −4
Original line number Diff line number Diff line
@@ -51,10 +51,10 @@ public final class DevicePolicyState implements Parcelable { 
            mPolicies.put(userHandle, new HashMap<>());

            int policiesSize = source.readInt();

            for (int j = 0; j < policiesSize; j++) {

                PolicyKey policyKey =

                        source.readParcelable(PolicyKey.class.getClassLoader());

                PolicyState<?> policyState =

                        source.readParcelable(PolicyState.class.getClassLoader());

                PolicyKey policyKey = source.readParcelable(PolicyKey.class.getClassLoader(),

                        PolicyKey.class);

                PolicyState<?> policyState = source.readParcelable(

                        PolicyState.class.getClassLoader(), PolicyState.class);

                mPolicies.get(userHandle).put(policyKey, policyState);

            }

        }

core/java/android/app/admin/EnforcingAdmin.java

+3 −2
Original line number Diff line number Diff line
@@ -74,8 +74,9 @@ public final class EnforcingAdmin implements Parcelable { 
        mPackageName = Objects.requireNonNull(source.readString());

        mUserHandle = new UserHandle(source.readInt());

        mAuthority = Objects.requireNonNull(

                source.readParcelable(Authority.class.getClassLoader()));

        mComponentName = source.readParcelable(ComponentName.class.getClassLoader());

                source.readParcelable(Authority.class.getClassLoader(), Authority.class));

        mComponentName = source.readParcelable(ComponentName.class.getClassLoader(),

                ComponentName.class);

    }



    /**

core/java/android/app/admin/MostRestrictive.java

+2 −1
Original line number Diff line number Diff line
@@ -76,7 +76,8 @@ public final class MostRestrictive<V> extends ResolutionMechanism<V> { 
        mMostToLeastRestrictive = new ArrayList<>();

        int size = source.readInt();

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

            mMostToLeastRestrictive.add(source.readParcelable(PolicyValue.class.getClassLoader()));

            mMostToLeastRestrictive.add(

                    source.readParcelable(PolicyValue.class.getClassLoader(), PolicyValue.class));

        }

    }

core/java/android/app/admin/PolicyState.java

+8 −4
Original line number Diff line number Diff line
@@ -62,12 +62,16 @@ public final class PolicyState<V> implements Parcelable { 
    private PolicyState(Parcel source) {

        int size = source.readInt();

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

            EnforcingAdmin admin = source.readParcelable(EnforcingAdmin.class.getClassLoader());

            PolicyValue<V> policyValue = source.readParcelable(PolicyValue.class.getClassLoader());

            EnforcingAdmin admin = source.readParcelable(EnforcingAdmin.class.getClassLoader(),

                    EnforcingAdmin.class);

            PolicyValue<V> policyValue = source.readParcelable(PolicyValue.class.getClassLoader(),

                    PolicyValue.class);

            mPoliciesSetByAdmins.put(admin, policyValue);

        }

        mCurrentResolvedPolicy = source.readParcelable(PolicyValue.class.getClassLoader());

        mResolutionMechanism = source.readParcelable(ResolutionMechanism.class.getClassLoader());

        mCurrentResolvedPolicy = source.readParcelable(PolicyValue.class.getClassLoader(),

                PolicyValue.class);

        mResolutionMechanism = source.readParcelable(ResolutionMechanism.class.getClassLoader(),

                ResolutionMechanism.class);

    }



    /**