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

Commit e08b6fff authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use type safe API of readParcelableArray" into tm-dev am: 39de4887 

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



Change-Id: I934a4107a94cd52d60d7bcedd88a47c26085e6c2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4149229f 39de4887

core/java/android/hardware/usb/UsbConfiguration.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -172,7 +172,8 @@ public class UsbConfiguration implements Parcelable { 
            String name = in.readString();

            String name = in.readString();

            int attributes = in.readInt();

            int attributes = in.readInt();

            int maxPower = in.readInt();

            int maxPower = in.readInt();

            Parcelable[] interfaces = in.readParcelableArray(UsbInterface.class.getClassLoader());

            Parcelable[] interfaces = in.readParcelableArray(

                    UsbInterface.class.getClassLoader(), UsbInterface.class);

            UsbConfiguration configuration = new UsbConfiguration(id, name, attributes, maxPower);

            UsbConfiguration configuration = new UsbConfiguration(id, name, attributes, maxPower);

            configuration.setInterfaces(interfaces);

            configuration.setInterfaces(interfaces);

            return configuration;

            return configuration;