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

Commit c6ebb14b authored by Bernardo Rufino's avatar Bernardo Rufino Committed by Android (Google) Code Review
Browse files

Merge "Migrate unsafer parcel APIs [2]"

parents 3907b90f 74ee11c3

apex/media/framework/java/android/media/Session2CommandGroup.java

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ public final class Session2CommandGroup implements Parcelable { 
    /**

     * Used by parcelable creator.

     */

    @SuppressWarnings("WeakerAccess") /* synthetic access */

    @SuppressWarnings({"WeakerAccess", "UnsafeParcelApi"}) /* synthetic access */

    Session2CommandGroup(Parcel in) {

        Parcelable[] commands = in.readParcelableArray(Session2Command.class.getClassLoader());

        if (commands != null) {

core/java/android/accessibilityservice/GestureDescription.java

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ public final class GestureDescription { 
        public GestureStep(Parcel parcel) {

            timeSinceGestureStart = parcel.readLong();

            Parcelable[] parcelables =

                    parcel.readParcelableArray(TouchPoint.class.getClassLoader());

                    parcel.readParcelableArray(TouchPoint.class.getClassLoader(), TouchPoint.class);

            numTouchPoints = (parcelables == null) ? 0 : parcelables.length;

            touchPoints = new TouchPoint[numTouchPoints];

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

core/java/android/content/RestrictionEntry.java

+1 −1
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ public class RestrictionEntry implements Parcelable { 
        mChoiceValues = in.readStringArray();

        mCurrentValue = in.readString();

        mCurrentValues = in.readStringArray();

        Parcelable[] parcelables = in.readParcelableArray(null);

        Parcelable[] parcelables = in.readParcelableArray(null, RestrictionEntry.class);

        if (parcelables != null) {

            mRestrictions = new RestrictionEntry[parcelables.length];

            for (int i = 0; i < parcelables.length; i++) {

core/java/android/hardware/camera2/CaptureRequest.java

+2 −1
Original line number Diff line number Diff line
@@ -599,7 +599,8 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 


        synchronized (mSurfacesLock) {

            mSurfaceSet.clear();

            Parcelable[] parcelableArray = in.readParcelableArray(Surface.class.getClassLoader());

            Parcelable[] parcelableArray = in.readParcelableArray(Surface.class.getClassLoader(),

                    Surface.class);

            if (parcelableArray != null) {

                for (Parcelable p : parcelableArray) {

                    Surface s = (Surface) p;

core/java/android/hardware/radio/RadioManager.java

+2 −1
Original line number Diff line number Diff line
@@ -436,7 +436,8 @@ public class RadioManager { 
            mNumAudioSources = in.readInt();

            mIsInitializationRequired = in.readInt() == 1;

            mIsCaptureSupported = in.readInt() == 1;

            Parcelable[] tmp = in.readParcelableArray(BandDescriptor.class.getClassLoader());

            Parcelable[] tmp = in.readParcelableArray(BandDescriptor.class.getClassLoader(),

                    BandDescriptor.class);

            mBands = new BandDescriptor[tmp.length];

            for (int i = 0; i < tmp.length; i++) {

                mBands[i] = (BandDescriptor) tmp[i];