Merge "Updates DeviceState to use specific parcel methods" into main (161b2efa) · Commits · e / os / android_frameworks_base

core/java/android/hardware/devicestate/DeviceState.java

+7 −20

Original line number	Diff line number	Diff line
		@@ -399,16 +399,8 @@ public final class DeviceState {
		public void writeToParcel(@NonNull Parcel dest, int flags) {
		dest.writeInt(mIdentifier);
		dest.writeString8(mName);

		dest.writeInt(mSystemProperties.size());
		for (int i = 0; i < mSystemProperties.size(); i++) {
		dest.writeInt(mSystemProperties.valueAt(i));
		}

		dest.writeInt(mPhysicalProperties.size());
		for (int i = 0; i < mPhysicalProperties.size(); i++) {
		dest.writeInt(mPhysicalProperties.valueAt(i));
		}
		dest.writeArraySet(mSystemProperties);
		dest.writeArraySet(mPhysicalProperties);
		}

		@NonNull
		@@ -417,16 +409,11 @@ public final class DeviceState {
		public DeviceState.Configuration createFromParcel(Parcel source) {
		int identifier = source.readInt();
		String name = source.readString8();
		ArraySet<@DeviceStateProperties Integer> systemProperties = new ArraySet<>();
		int systemPropertySize = source.readInt();
		for (int i = 0; i < systemPropertySize; i++) {
		systemProperties.add(source.readInt());
		}
		ArraySet<@DeviceStateProperties Integer> physicalProperties = new ArraySet<>();
		int physicalPropertySize = source.readInt();
		for (int j = 0; j < physicalPropertySize; j++) {
		physicalProperties.add(source.readInt());
		}
		ArraySet<@SystemDeviceStateProperties Integer> systemProperties =
		(ArraySet<Integer>) source.readArraySet(null /* classLoader */);
		ArraySet<@PhysicalDeviceStateProperties Integer> physicalProperties =
		(ArraySet<Integer>) source.readArraySet(null /* classLoader */);

		return new DeviceState.Configuration(identifier, name, systemProperties,
		physicalProperties);
		}