Merge "Few minor codegen fixes" (e84f3604) · Commits · e / os / android_frameworks_base

tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -32,13 +32,17 @@ public class HierrarchicalDataClassBase implements Parcelable {



		// Code below generated by codegen v1.0.7.
		// Code below generated by codegen v1.0.8.
		//
		// DO NOT MODIFY!
		// CHECKSTYLE:OFF Generated code
		//
		// To regenerate run:
		// $ codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java
		//
		// To exclude the generated code from IntelliJ auto-formatting enable (one-time):
		// Settings > Editor > Code Style > Formatter Control
		//@formatter:off


		@DataClass.Generated.Member
		@@ -94,8 +98,8 @@ public class HierrarchicalDataClassBase implements Parcelable {
		};

		@DataClass.Generated(
		time = 1570576455287L,
		codegenVersion = "1.0.7",
		time = 1570828332402L,
		codegenVersion = "1.0.8",
		sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java",
		inputSignatures = "private int mBaseData\nclass HierrarchicalDataClassBase extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genConstructor=false, genSetters=true)")
		@Deprecated

tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassChild.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -46,13 +46,17 @@ public class HierrarchicalDataClassChild extends HierrarchicalDataClassBase {



		// Code below generated by codegen v1.0.7.
		// Code below generated by codegen v1.0.8.
		//
		// DO NOT MODIFY!
		// CHECKSTYLE:OFF Generated code
		//
		// To regenerate run:
		// $ codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassChild.java
		//
		// To exclude the generated code from IntelliJ auto-formatting enable (one-time):
		// Settings > Editor > Code Style > Formatter Control
		//@formatter:off


		@DataClass.Generated.Member
		@@ -116,8 +120,8 @@ public class HierrarchicalDataClassChild extends HierrarchicalDataClassBase {
		};

		@DataClass.Generated(
		time = 1570576456245L,
		codegenVersion = "1.0.7",
		time = 1570828333399L,
		codegenVersion = "1.0.8",
		sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassChild.java",
		inputSignatures = "private @android.annotation.NonNull java.lang.String mChildData\nclass HierrarchicalDataClassChild extends com.android.codegentest.HierrarchicalDataClassBase implements []\n@com.android.internal.util.DataClass(genParcelable=true, genConstructor=false, genSetters=true)")
		@Deprecated

tests/Codegen/src/com/android/codegentest/ParcelAllTheThingsDataClass.java

+45 −9

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		package com.android.codegentest;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.util.SparseArray;
		@@ -46,15 +47,22 @@ public class ParcelAllTheThingsDataClass implements Parcelable {
		@NonNull SparseArray<SampleWithCustomBuilder> mSparseArray = null;
		@NonNull SparseIntArray mSparseIntArray = null;

		@SuppressWarnings({"WeakerAccess"})
		@Nullable Boolean mNullableBoolean = null;


		// Code below generated by codegen v1.0.7.

		// Code below generated by codegen v1.0.8.
		//
		// DO NOT MODIFY!
		// CHECKSTYLE:OFF Generated code
		//
		// To regenerate run:
		// $ codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/ParcelAllTheThingsDataClass.java
		//
		// To exclude the generated code from IntelliJ auto-formatting enable (one-time):
		// Settings > Editor > Code Style > Formatter Control
		//@formatter:off


		@DataClass.Generated.Member
		@@ -65,7 +73,8 @@ public class ParcelAllTheThingsDataClass implements Parcelable {
		@NonNull Map<String,SampleWithCustomBuilder> map,
		@NonNull Map<String,String> stringMap,
		@NonNull SparseArray<SampleWithCustomBuilder> sparseArray,
		@NonNull SparseIntArray sparseIntArray) {
		@NonNull SparseIntArray sparseIntArray,
		@SuppressWarnings({ "WeakerAccess" }) @Nullable Boolean nullableBoolean) {
		this.mStringArray = stringArray;
		AnnotationValidations.validate(
		NonNull.class, null, mStringArray);
		@@ -87,6 +96,7 @@ public class ParcelAllTheThingsDataClass implements Parcelable {
		this.mSparseIntArray = sparseIntArray;
		AnnotationValidations.validate(
		NonNull.class, null, mSparseIntArray);
		this.mNullableBoolean = nullableBoolean;

		// onConstructed(); // You can define this method to get a callback
		}
		@@ -126,6 +136,11 @@ public class ParcelAllTheThingsDataClass implements Parcelable {
		return mSparseIntArray;
		}

		@DataClass.Generated.Member
		public @SuppressWarnings({ "WeakerAccess" }) @Nullable Boolean getNullableBoolean() {
		return mNullableBoolean;
		}

		@Override
		@DataClass.Generated.Member
		public String toString() {
		@@ -139,7 +154,8 @@ public class ParcelAllTheThingsDataClass implements Parcelable {
		"map = " + mMap + ", " +
		"stringMap = " + mStringMap + ", " +
		"sparseArray = " + mSparseArray + ", " +
		"sparseIntArray = " + mSparseIntArray +
		"sparseIntArray = " + mSparseIntArray + ", " +
		"nullableBoolean = " + mNullableBoolean +
		" }";
		}

		@@ -149,6 +165,9 @@ public class ParcelAllTheThingsDataClass implements Parcelable {
		// You can override field parcelling by defining methods like:
		// void parcelFieldName(Parcel dest, int flags) { ... }

		int flg = 0;
		if (mNullableBoolean != null) flg \|= 0x80;
		dest.writeInt(flg);
		dest.writeStringArray(mStringArray);
		dest.writeIntArray(mIntArray);
		dest.writeStringList(mStringList);
		@@ -156,6 +175,7 @@ public class ParcelAllTheThingsDataClass implements Parcelable {
		dest.writeMap(mStringMap);
		dest.writeSparseArray(mSparseArray);
		dest.writeSparseIntArray(mSparseIntArray);
		if (mNullableBoolean != null) dest.writeBoolean(mNullableBoolean);
		}

		@Override
		@@ -169,6 +189,7 @@ public class ParcelAllTheThingsDataClass implements Parcelable {
		// You can override field unparcelling by defining methods like:
		// static FieldType unparcelFieldName(Parcel in) { ... }

		int flg = in.readInt();
		String[] stringArray = in.createStringArray();
		int[] intArray = in.createIntArray();
		List<String> stringList = new java.util.ArrayList<>();
		@@ -179,6 +200,7 @@ public class ParcelAllTheThingsDataClass implements Parcelable {
		in.readMap(stringMap, String.class.getClassLoader());
		SparseArray<SampleWithCustomBuilder> sparseArray = (SparseArray) in.readSparseArray(SampleWithCustomBuilder.class.getClassLoader());
		SparseIntArray sparseIntArray = (SparseIntArray) in.readSparseIntArray();
		Boolean nullableBoolean = (flg & 0x80) == 0 ? null : (Boolean) in.readBoolean();

		this.mStringArray = stringArray;
		AnnotationValidations.validate(
		@@ -201,6 +223,7 @@ public class ParcelAllTheThingsDataClass implements Parcelable {
		this.mSparseIntArray = sparseIntArray;
		AnnotationValidations.validate(
		NonNull.class, null, mSparseIntArray);
		this.mNullableBoolean = nullableBoolean;

		// onConstructed(); // You can define this method to get a callback
		}
		@@ -233,6 +256,7 @@ public class ParcelAllTheThingsDataClass implements Parcelable {
		private @NonNull Map<String,String> mStringMap;
		private @NonNull SparseArray<SampleWithCustomBuilder> mSparseArray;
		private @NonNull SparseIntArray mSparseIntArray;
		private @SuppressWarnings({ "WeakerAccess" }) @Nullable Boolean mNullableBoolean;

		private long mBuilderFieldsSet = 0L;

		@@ -328,10 +352,18 @@ public class ParcelAllTheThingsDataClass implements Parcelable {
		return this;
		}

		@DataClass.Generated.Member
		public @NonNull Builder setNullableBoolean(@SuppressWarnings({ "WeakerAccess" }) @Nullable Boolean value) {
		checkNotUsed();
		mBuilderFieldsSet \|= 0x80;
		mNullableBoolean = value;
		return this;
		}

		/** Builds the instance. This builder should not be touched after calling this! */
		public ParcelAllTheThingsDataClass build() {
		checkNotUsed();
		mBuilderFieldsSet \|= 0x80; // Mark builder used
		mBuilderFieldsSet \|= 0x100; // Mark builder used

		if ((mBuilderFieldsSet & 0x1) == 0) {
		mStringArray = null;
		@@ -354,6 +386,9 @@ public class ParcelAllTheThingsDataClass implements Parcelable {
		if ((mBuilderFieldsSet & 0x40) == 0) {
		mSparseIntArray = null;
		}
		if ((mBuilderFieldsSet & 0x80) == 0) {
		mNullableBoolean = null;
		}
		ParcelAllTheThingsDataClass o = new ParcelAllTheThingsDataClass(
		mStringArray,
		mIntArray,
		@@ -361,12 +396,13 @@ public class ParcelAllTheThingsDataClass implements Parcelable {
		mMap,
		mStringMap,
		mSparseArray,
		mSparseIntArray);
		mSparseIntArray,
		mNullableBoolean);
		return o;
		}

		private void checkNotUsed() {
		if ((mBuilderFieldsSet & 0x80) != 0) {
		if ((mBuilderFieldsSet & 0x100) != 0) {
		throw new IllegalStateException(
		"This Builder should not be reused. Use a new Builder instance instead");
		}
		@@ -374,10 +410,10 @@ public class ParcelAllTheThingsDataClass implements Parcelable {
		}

		@DataClass.Generated(
		time = 1570576454326L,
		codegenVersion = "1.0.7",
		time = 1570828331396L,
		codegenVersion = "1.0.8",
		sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/ParcelAllTheThingsDataClass.java",
		inputSignatures = " @android.annotation.NonNull java.lang.String[] mStringArray\n @android.annotation.NonNull int[] mIntArray\n @android.annotation.NonNull java.util.List<java.lang.String> mStringList\n @android.annotation.NonNull java.util.Map<java.lang.String,com.android.codegentest.SampleWithCustomBuilder> mMap\n @android.annotation.NonNull java.util.Map<java.lang.String,java.lang.String> mStringMap\n @android.annotation.NonNull android.util.SparseArray<com.android.codegentest.SampleWithCustomBuilder> mSparseArray\n @android.annotation.NonNull android.util.SparseIntArray mSparseIntArray\nclass ParcelAllTheThingsDataClass extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genBuilder=true, genAidl=false, genToString=true)")
		inputSignatures = " @android.annotation.NonNull java.lang.String[] mStringArray\n @android.annotation.NonNull int[] mIntArray\n @android.annotation.NonNull java.util.List<java.lang.String> mStringList\n @android.annotation.NonNull java.util.Map<java.lang.String,com.android.codegentest.SampleWithCustomBuilder> mMap\n @android.annotation.NonNull java.util.Map<java.lang.String,java.lang.String> mStringMap\n @android.annotation.NonNull android.util.SparseArray<com.android.codegentest.SampleWithCustomBuilder> mSparseArray\n @android.annotation.NonNull android.util.SparseIntArray mSparseIntArray\n @java.lang.SuppressWarnings({\"WeakerAccess\"}) @android.annotation.Nullable java.lang.Boolean mNullableBoolean\nclass ParcelAllTheThingsDataClass extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genBuilder=true, genAidl=false, genToString=true)")
		@Deprecated
		private void __metadata() {}

tests/Codegen/src/com/android/codegentest/SampleDataClass.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -342,13 +342,17 @@ public final class SampleDataClass implements Parcelable {



		// Code below generated by codegen v1.0.7.
		// Code below generated by codegen v1.0.8.
		//
		// DO NOT MODIFY!
		// CHECKSTYLE:OFF Generated code
		//
		// To regenerate run:
		// $ codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/SampleDataClass.java
		//
		// To exclude the generated code from IntelliJ auto-formatting enable (one-time):
		// Settings > Editor > Code Style > Formatter Control
		//@formatter:off


		@IntDef(prefix = "STATE_", value = {
		@@ -1868,8 +1872,8 @@ public final class SampleDataClass implements Parcelable {
		}

		@DataClass.Generated(
		time = 1570576452225L,
		codegenVersion = "1.0.7",
		time = 1570828329319L,
		codegenVersion = "1.0.8",
		sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/SampleDataClass.java",
		inputSignatures = "public static final java.lang.String STATE_NAME_UNDEFINED\npublic static final java.lang.String STATE_NAME_ON\npublic static final java.lang.String STATE_NAME_OFF\npublic static final int STATE_UNDEFINED\npublic static final int STATE_ON\npublic static final int STATE_OFF\npublic static final @com.android.codegentest.SampleDataClass.RequestFlags int FLAG_MANUAL_REQUEST\npublic static final @com.android.codegentest.SampleDataClass.RequestFlags int FLAG_COMPATIBILITY_MODE_REQUEST\npublic static final @com.android.codegentest.SampleDataClass.RequestFlags int FLAG_AUGMENTED_REQUEST\nprivate int mNum\nprivate int mNum2\nprivate int mNum4\nprivate @android.annotation.Nullable java.lang.String mName\nprivate @android.annotation.NonNull java.lang.String mName2\nprivate @android.annotation.NonNull java.lang.String mName4\nprivate @android.annotation.Nullable android.view.accessibility.AccessibilityNodeInfo mOtherParcelable\nprivate @com.android.internal.util.DataClass.ParcelWith(com.android.codegentest.MyDateParcelling.class) @android.annotation.NonNull java.util.Date mDate\nprivate @com.android.internal.util.DataClass.ParcelWith(com.android.internal.util.Parcelling.BuiltIn.ForPattern.class) @android.annotation.NonNull java.util.regex.Pattern mPattern\nprivate @android.annotation.NonNull java.util.List<android.net.LinkAddress> mLinkAddresses2\nprivate @com.android.internal.util.DataClass.PluralOf(\"linkAddress\") @android.annotation.NonNull java.util.ArrayList<android.net.LinkAddress> mLinkAddresses\nprivate @android.annotation.Nullable android.net.LinkAddress[] mLinkAddresses4\nprivate @com.android.codegentest.SampleDataClass.StateName @android.annotation.NonNull java.lang.String mStateName\nprivate @com.android.codegentest.SampleDataClass.RequestFlags int mFlags\nprivate @com.android.codegentest.SampleDataClass.State int mState\npublic @android.annotation.NonNull java.lang.CharSequence charSeq\nprivate final @android.annotation.Nullable android.net.LinkAddress[] mLinkAddresses5\nprivate transient android.net.LinkAddress[] mLinkAddresses6\ntransient int[] mTmpStorage\nprivate @android.annotation.StringRes int mStringRes\nprivate @android.annotation.IntRange(from=0L, to=6L) int mDayOfWeek\nprivate @android.annotation.Size(2L) @android.annotation.NonNull @com.android.internal.util.DataClass.Each @android.annotation.FloatRange(from=0.0) float[] mCoords\nprivate static java.lang.String defaultName4()\nprivate int[] lazyInitTmpStorage()\npublic android.net.LinkAddress[] getLinkAddresses4()\nprivate boolean patternEquals(java.util.regex.Pattern)\nprivate int patternHashCode()\nprivate void onConstructed()\npublic void dump(java.io.PrintWriter)\nclass SampleDataClass extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genBuilder=true, genConstructor=true, genEqualsHashCode=true, genToString=true, genForEachField=true, genSetters=true)")
		@Deprecated

tests/Codegen/src/com/android/codegentest/SampleWithCustomBuilder.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -85,13 +85,17 @@ public class SampleWithCustomBuilder implements Parcelable {



		// Code below generated by codegen v1.0.7.
		// Code below generated by codegen v1.0.8.
		//
		// DO NOT MODIFY!
		// CHECKSTYLE:OFF Generated code
		//
		// To regenerate run:
		// $ codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/SampleWithCustomBuilder.java
		//
		// To exclude the generated code from IntelliJ auto-formatting enable (one-time):
		// Settings > Editor > Code Style > Formatter Control
		//@formatter:off


		@DataClass.Generated.Member
		@@ -249,8 +253,8 @@ public class SampleWithCustomBuilder implements Parcelable {
		}

		@DataClass.Generated(
		time = 1570576453295L,
		codegenVersion = "1.0.7",
		time = 1570828330331L,
		codegenVersion = "1.0.8",
		sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/SampleWithCustomBuilder.java",
		inputSignatures = " long delayAmount\n @android.annotation.NonNull java.util.concurrent.TimeUnit delayUnit\n long creationTimestamp\nprivate static java.util.concurrent.TimeUnit unparcelDelayUnit(android.os.Parcel)\nprivate void parcelDelayUnit(android.os.Parcel,int)\nclass SampleWithCustomBuilder extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genBuilder=true, genAidl=false, genToString=true)\nabstract com.android.codegentest.SampleWithCustomBuilder.Builder setDelayAmount(long)\npublic abstract com.android.codegentest.SampleWithCustomBuilder.Builder setDelayUnit(java.util.concurrent.TimeUnit)\npublic com.android.codegentest.SampleWithCustomBuilder.Builder setDelay(long,java.util.concurrent.TimeUnit)\nclass BaseBuilder extends java.lang.Object implements []")
		@Deprecated