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

Commit 4150960e authored by Eugene Susla's avatar Eugene Susla
Browse files

Relax literal initializer requirement when codegen detects constants 

Test: . frameworks/base/tests/Codegen/runTest.sh
Fixes: 158195639
Change-Id: I93bdea18f348aeca896a9fd619bef2d65704bb41
parent 7e56edb8

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ public class HierrarchicalDataClassBase implements Parcelable { 












    // Code below generated by codegen v1.0.16.

    // Code below generated by codegen v1.0.18.

    //

    //

    // DO NOT MODIFY!

    // DO NOT MODIFY!

    // CHECKSTYLE:OFF Generated code

    // CHECKSTYLE:OFF Generated code
@@ -51,7 +51,7 @@ public class HierrarchicalDataClassBase implements Parcelable { 
    }

    }





    @DataClass.Generated.Member

    @DataClass.Generated.Member

    public HierrarchicalDataClassBase setBaseData( int value) {

    public @android.annotation.NonNull HierrarchicalDataClassBase setBaseData( int value) {

        mBaseData = value;

        mBaseData = value;

        return this;

        return this;

    }

    }
@@ -98,8 +98,8 @@ public class HierrarchicalDataClassBase implements Parcelable { 
    };

    };





    @DataClass.Generated(

    @DataClass.Generated(

            time = 1601950882280L,

            time = 1603836848866L,

            codegenVersion = "1.0.16",

            codegenVersion = "1.0.18",

            sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java",

            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)")

            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

    @Deprecated

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ public class HierrarchicalDataClassChild extends HierrarchicalDataClassBase { 












    // Code below generated by codegen v1.0.16.

    // Code below generated by codegen v1.0.18.

    //

    //

    // DO NOT MODIFY!

    // DO NOT MODIFY!

    // CHECKSTYLE:OFF Generated code

    // CHECKSTYLE:OFF Generated code
@@ -65,7 +65,7 @@ public class HierrarchicalDataClassChild extends HierrarchicalDataClassBase { 
    }

    }





    @DataClass.Generated.Member

    @DataClass.Generated.Member

    public HierrarchicalDataClassChild setChildData(@NonNull String value) {

    public @NonNull HierrarchicalDataClassChild setChildData(@NonNull String value) {

        mChildData = value;

        mChildData = value;

        com.android.internal.util.AnnotationValidations.validate(

        com.android.internal.util.AnnotationValidations.validate(

                NonNull.class, null, mChildData);

                NonNull.class, null, mChildData);
@@ -120,8 +120,8 @@ public class HierrarchicalDataClassChild extends HierrarchicalDataClassBase { 
    };

    };





    @DataClass.Generated(

    @DataClass.Generated(

            time = 1601950883222L,

            time = 1603836849753L,

            codegenVersion = "1.0.16",

            codegenVersion = "1.0.18",

            sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassChild.java",

            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)")

            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

    @Deprecated

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ public class ParcelAllTheThingsDataClass implements Parcelable { 












    // Code below generated by codegen v1.0.16.

    // Code below generated by codegen v1.0.18.

    //

    //

    // DO NOT MODIFY!

    // DO NOT MODIFY!

    // CHECKSTYLE:OFF Generated code

    // CHECKSTYLE:OFF Generated code
@@ -412,8 +412,8 @@ public class ParcelAllTheThingsDataClass implements Parcelable { 
    }

    }





    @DataClass.Generated(

    @DataClass.Generated(

            time = 1601950881327L,

            time = 1603836847927L,

            codegenVersion = "1.0.16",

            codegenVersion = "1.0.18",

            sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/ParcelAllTheThingsDataClass.java",

            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\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)")

            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

    @Deprecated

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

+44 −42
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ import android.annotation.Size; 
import android.annotation.StringDef;

import android.annotation.StringDef;

import android.annotation.StringRes;

import android.annotation.StringRes;

import android.annotation.UserIdInt;

import android.annotation.UserIdInt;

import android.content.pm.PackageManager;

import android.net.LinkAddress;

import android.net.LinkAddress;

import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;
@@ -86,9 +87,10 @@ public final class SampleDataClass implements Parcelable { 
     * @see #toString()

     * @see #toString()

     * @see State

     * @see State

     */

     */

    public static final int STATE_UNDEFINED = -1;

    public static final int STATE_ON = 1;

    public static final int STATE_ON = 1;

    public static final int STATE_OFF = 0;

    public static final int STATE_OFF = 0;

    public static final int STATE_UNDEFINED

            = PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED;





    /**

    /**

     * {@link IntDef}s with values specified in hex("0x...") are considered to be

     * {@link IntDef}s with values specified in hex("0x...") are considered to be
@@ -342,7 +344,7 @@ public final class SampleDataClass implements Parcelable { 












    // Code below generated by codegen v1.0.16.

    // Code below generated by codegen v1.0.18.

    //

    //

    // DO NOT MODIFY!

    // DO NOT MODIFY!

    // CHECKSTYLE:OFF Generated code

    // CHECKSTYLE:OFF Generated code
@@ -356,9 +358,9 @@ public final class SampleDataClass implements Parcelable { 








    @IntDef(prefix = "STATE_", value = {

    @IntDef(prefix = "STATE_", value = {

        STATE_UNDEFINED,

        STATE_ON,

        STATE_ON,

        STATE_OFF

        STATE_OFF,

        STATE_UNDEFINED

    })

    })

    @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE)

    @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE)

    @DataClass.Generated.Member

    @DataClass.Generated.Member
@@ -367,12 +369,12 @@ public final class SampleDataClass implements Parcelable { 
    @DataClass.Generated.Member

    @DataClass.Generated.Member

    public static String stateToString(@State int value) {

    public static String stateToString(@State int value) {

        switch (value) {

        switch (value) {

            case STATE_UNDEFINED:

                    return "STATE_UNDEFINED";

            case STATE_ON:

            case STATE_ON:

                    return "STATE_ON";

                    return "STATE_ON";

            case STATE_OFF:

            case STATE_OFF:

                    return "STATE_OFF";

                    return "STATE_OFF";

            case STATE_UNDEFINED:

                    return "STATE_UNDEFINED";

            default: return Integer.toHexString(value);

            default: return Integer.toHexString(value);

        }

        }

    }

    }
@@ -560,14 +562,14 @@ public final class SampleDataClass implements Parcelable { 
                        | FLAG_AUGMENTED_REQUEST);

                        | FLAG_AUGMENTED_REQUEST);

        this.mState = state;

        this.mState = state;





        if (!(mState == STATE_UNDEFINED)

        if (!(mState == STATE_ON)

                && !(mState == STATE_ON)

                && !(mState == STATE_OFF)

                && !(mState == STATE_OFF)) {

                && !(mState == STATE_UNDEFINED)) {

            throw new java.lang.IllegalArgumentException(

            throw new java.lang.IllegalArgumentException(

                    "state was " + mState + " but must be one of: "

                    "state was " + mState + " but must be one of: "

                            + "STATE_UNDEFINED(" + STATE_UNDEFINED + "), "

                            + "STATE_ON(" + STATE_ON + "), "

                            + "STATE_ON(" + STATE_ON + "), "

                            + "STATE_OFF(" + STATE_OFF + ")");

                            + "STATE_OFF(" + STATE_OFF + "), "

                            + "STATE_UNDEFINED(" + STATE_UNDEFINED + ")");

        }

        }





        this.charSeq = charSeq;

        this.charSeq = charSeq;
@@ -820,7 +822,7 @@ public final class SampleDataClass implements Parcelable { 
     * pieces in multiple places for each field.

     * pieces in multiple places for each field.

     */

     */

    @DataClass.Generated.Member

    @DataClass.Generated.Member

    public SampleDataClass setNum( int value) {

    public @NonNull SampleDataClass setNum( int value) {

        mNum = value;

        mNum = value;

        return this;

        return this;

    }

    }
@@ -832,7 +834,7 @@ public final class SampleDataClass implements Parcelable { 
     * @see #mNum2 ..and so should blocks at the bottom, e.g. {@code @see} blocks.

     * @see #mNum2 ..and so should blocks at the bottom, e.g. {@code @see} blocks.

     */

     */

    @DataClass.Generated.Member

    @DataClass.Generated.Member

    public SampleDataClass setNum2( int value) {

    public @NonNull SampleDataClass setNum2( int value) {

        mNum2 = value;

        mNum2 = value;

        return this;

        return this;

    }

    }
@@ -846,7 +848,7 @@ public final class SampleDataClass implements Parcelable { 
     * @hide

     * @hide

     */

     */

    @DataClass.Generated.Member

    @DataClass.Generated.Member

    public SampleDataClass setNum4( int value) {

    public @NonNull SampleDataClass setNum4( int value) {

        mNum4 = value;

        mNum4 = value;

        return this;

        return this;

    }

    }
@@ -855,7 +857,7 @@ public final class SampleDataClass implements Parcelable { 
     * {@link Nullable} or {@link NonNull} annotation is required on all non-primitive fields.

     * {@link Nullable} or {@link NonNull} annotation is required on all non-primitive fields.

     */

     */

    @DataClass.Generated.Member

    @DataClass.Generated.Member

    public SampleDataClass setName(@NonNull String value) {

    public @NonNull SampleDataClass setName(@NonNull String value) {

        mName = value;

        mName = value;

        return this;

        return this;

    }

    }
@@ -868,7 +870,7 @@ public final class SampleDataClass implements Parcelable { 
     * while mandatory fields are passed via {@link Builder#Builder constructor}.

     * while mandatory fields are passed via {@link Builder#Builder constructor}.

     */

     */

    @DataClass.Generated.Member

    @DataClass.Generated.Member

    public SampleDataClass setName2(@NonNull String value) {

    public @NonNull SampleDataClass setName2(@NonNull String value) {

        mName2 = value;

        mName2 = value;

        AnnotationValidations.validate(

        AnnotationValidations.validate(

                NonNull.class, null, mName2);

                NonNull.class, null, mName2);
@@ -880,7 +882,7 @@ public final class SampleDataClass implements Parcelable { 
     * {@link #defaultName4 defaultFieldName()} can be defined to compute the default value.

     * {@link #defaultName4 defaultFieldName()} can be defined to compute the default value.

     */

     */

    @DataClass.Generated.Member

    @DataClass.Generated.Member

    public SampleDataClass setName4(@NonNull String value) {

    public @NonNull SampleDataClass setName4(@NonNull String value) {

        mName4 = value;

        mName4 = value;

        AnnotationValidations.validate(

        AnnotationValidations.validate(

                NonNull.class, null, mName4);

                NonNull.class, null, mName4);
@@ -892,7 +894,7 @@ public final class SampleDataClass implements Parcelable { 
     * E.g. {@link Parcelable} subclasses, {@link String}, {@link int}, {@link boolean}, etc.

     * E.g. {@link Parcelable} subclasses, {@link String}, {@link int}, {@link boolean}, etc.

     */

     */

    @DataClass.Generated.Member

    @DataClass.Generated.Member

    public SampleDataClass setOtherParcelable(@NonNull AccessibilityNodeInfo value) {

    public @NonNull SampleDataClass setOtherParcelable(@NonNull AccessibilityNodeInfo value) {

        mOtherParcelable = value;

        mOtherParcelable = value;

        return this;

        return this;

    }

    }
@@ -904,7 +906,7 @@ public final class SampleDataClass implements Parcelable { 
     * @see MyDateParcelling an example {@link Parcelling} implementation

     * @see MyDateParcelling an example {@link Parcelling} implementation

     */

     */

    @DataClass.Generated.Member

    @DataClass.Generated.Member

    public SampleDataClass setDate(@NonNull Date value) {

    public @NonNull SampleDataClass setDate(@NonNull Date value) {

        mDate = value;

        mDate = value;

        AnnotationValidations.validate(

        AnnotationValidations.validate(

                NonNull.class, null, mDate);

                NonNull.class, null, mDate);
@@ -916,7 +918,7 @@ public final class SampleDataClass implements Parcelable { 
     * to encourage its reuse.

     * to encourage its reuse.

     */

     */

    @DataClass.Generated.Member

    @DataClass.Generated.Member

    public SampleDataClass setPattern(@NonNull Pattern value) {

    public @NonNull SampleDataClass setPattern(@NonNull Pattern value) {

        mPattern = value;

        mPattern = value;

        AnnotationValidations.validate(

        AnnotationValidations.validate(

                NonNull.class, null, mPattern);

                NonNull.class, null, mPattern);
@@ -929,7 +931,7 @@ public final class SampleDataClass implements Parcelable { 
     * {@link Builder#addLinkAddresses2(LinkAddress) add} method is generated for convenience.

     * {@link Builder#addLinkAddresses2(LinkAddress) add} method is generated for convenience.

     */

     */

    @DataClass.Generated.Member

    @DataClass.Generated.Member

    public SampleDataClass setLinkAddresses2(@NonNull List<LinkAddress> value) {

    public @NonNull SampleDataClass setLinkAddresses2(@NonNull List<LinkAddress> value) {

        mLinkAddresses2 = value;

        mLinkAddresses2 = value;

        AnnotationValidations.validate(

        AnnotationValidations.validate(

                NonNull.class, null, mLinkAddresses2);

                NonNull.class, null, mLinkAddresses2);
@@ -943,7 +945,7 @@ public final class SampleDataClass implements Parcelable { 
     * @see Builder#addLinkAddress(LinkAddress)

     * @see Builder#addLinkAddress(LinkAddress)

     */

     */

    @DataClass.Generated.Member

    @DataClass.Generated.Member

    public SampleDataClass setLinkAddresses(@NonNull ArrayList<LinkAddress> value) {

    public @NonNull SampleDataClass setLinkAddresses(@NonNull ArrayList<LinkAddress> value) {

        mLinkAddresses = value;

        mLinkAddresses = value;

        AnnotationValidations.validate(

        AnnotationValidations.validate(

                NonNull.class, null, mLinkAddresses);

                NonNull.class, null, mLinkAddresses);
@@ -957,7 +959,7 @@ public final class SampleDataClass implements Parcelable { 
     * @see Builder#setLinkAddresses4(LinkAddress...)

     * @see Builder#setLinkAddresses4(LinkAddress...)

     */

     */

    @DataClass.Generated.Member

    @DataClass.Generated.Member

    public SampleDataClass setLinkAddresses4(@NonNull LinkAddress... value) {

    public @NonNull SampleDataClass setLinkAddresses4(@NonNull LinkAddress... value) {

        mLinkAddresses4 = value;

        mLinkAddresses4 = value;

        return this;

        return this;

    }

    }
@@ -970,7 +972,7 @@ public final class SampleDataClass implements Parcelable { 
     * @see Builder#setStateName

     * @see Builder#setStateName

     */

     */

    @DataClass.Generated.Member

    @DataClass.Generated.Member

    public SampleDataClass setStateName(@StateName @NonNull String value) {

    public @NonNull SampleDataClass setStateName(@StateName @NonNull String value) {

        mStateName = value;

        mStateName = value;





        if (!(Objects.equals(mStateName, STATE_NAME_UNDEFINED))

        if (!(Objects.equals(mStateName, STATE_NAME_UNDEFINED))
@@ -992,7 +994,7 @@ public final class SampleDataClass implements Parcelable { 
     * Fields annotated with {@link IntDef} annotations also get a proper {@link #toString()} value.

     * Fields annotated with {@link IntDef} annotations also get a proper {@link #toString()} value.

     */

     */

    @DataClass.Generated.Member

    @DataClass.Generated.Member

    public SampleDataClass setFlags(@RequestFlags int value) {

    public @NonNull SampleDataClass setFlags(@RequestFlags int value) {

        mFlags = value;

        mFlags = value;





        Preconditions.checkFlagsArgument(

        Preconditions.checkFlagsArgument(
@@ -1007,17 +1009,17 @@ public final class SampleDataClass implements Parcelable { 
     * Above is true for both {@link IntDef#flag flags} and enum-like {@link IntDef}s

     * Above is true for both {@link IntDef#flag flags} and enum-like {@link IntDef}s

     */

     */

    @DataClass.Generated.Member

    @DataClass.Generated.Member

    public SampleDataClass setState(@State int value) {

    public @NonNull SampleDataClass setState(@State int value) {

        mState = value;

        mState = value;





        if (!(mState == STATE_UNDEFINED)

        if (!(mState == STATE_ON)

                && !(mState == STATE_ON)

                && !(mState == STATE_OFF)

                && !(mState == STATE_OFF)) {

                && !(mState == STATE_UNDEFINED)) {

            throw new java.lang.IllegalArgumentException(

            throw new java.lang.IllegalArgumentException(

                    "state was " + mState + " but must be one of: "

                    "state was " + mState + " but must be one of: "

                            + "STATE_UNDEFINED(" + STATE_UNDEFINED + "), "

                            + "STATE_ON(" + STATE_ON + "), "

                            + "STATE_ON(" + STATE_ON + "), "

                            + "STATE_OFF(" + STATE_OFF + ")");

                            + "STATE_OFF(" + STATE_OFF + "), "

                            + "STATE_UNDEFINED(" + STATE_UNDEFINED + ")");

        }

        }





        return this;

        return this;
@@ -1036,7 +1038,7 @@ public final class SampleDataClass implements Parcelable { 
     * @see #SampleDataClass

     * @see #SampleDataClass

     */

     */

    @DataClass.Generated.Member

    @DataClass.Generated.Member

    public SampleDataClass setStringRes(@StringRes int value) {

    public @NonNull SampleDataClass setStringRes(@StringRes int value) {

        mStringRes = value;

        mStringRes = value;

        AnnotationValidations.validate(

        AnnotationValidations.validate(

                StringRes.class, null, mStringRes);

                StringRes.class, null, mStringRes);
@@ -1051,7 +1053,7 @@ public final class SampleDataClass implements Parcelable { 
     * @see AnnotationValidations#validate(Class, Size, int, String, int, String, int)

     * @see AnnotationValidations#validate(Class, Size, int, String, int, String, int)

     */

     */

    @DataClass.Generated.Member

    @DataClass.Generated.Member

    public SampleDataClass setDayOfWeek(@android.annotation.IntRange(from = 0, to = 6) int value) {

    public @NonNull SampleDataClass setDayOfWeek(@android.annotation.IntRange(from = 0, to = 6) int value) {

        mDayOfWeek = value;

        mDayOfWeek = value;

        AnnotationValidations.validate(

        AnnotationValidations.validate(

                android.annotation.IntRange.class, null, mDayOfWeek,

                android.annotation.IntRange.class, null, mDayOfWeek,
@@ -1070,7 +1072,7 @@ public final class SampleDataClass implements Parcelable { 
     * @see AnnotationValidations#validate(Class, Size, int, String, int)

     * @see AnnotationValidations#validate(Class, Size, int, String, int)

     */

     */

    @DataClass.Generated.Member

    @DataClass.Generated.Member

    public SampleDataClass setCoords(@Size(2) @NonNull @FloatRange(from = 0f) float... value) {

    public @NonNull SampleDataClass setCoords(@Size(2) @NonNull @FloatRange(from = 0f) float... value) {

        mCoords = value;

        mCoords = value;

        AnnotationValidations.validate(

        AnnotationValidations.validate(

                Size.class, null, mCoords.length,

                Size.class, null, mCoords.length,
@@ -1372,14 +1374,14 @@ public final class SampleDataClass implements Parcelable { 
                        | FLAG_AUGMENTED_REQUEST);

                        | FLAG_AUGMENTED_REQUEST);

        this.mState = state;

        this.mState = state;





        if (!(mState == STATE_UNDEFINED)

        if (!(mState == STATE_ON)

                && !(mState == STATE_ON)

                && !(mState == STATE_OFF)

                && !(mState == STATE_OFF)) {

                && !(mState == STATE_UNDEFINED)) {

            throw new java.lang.IllegalArgumentException(

            throw new java.lang.IllegalArgumentException(

                    "state was " + mState + " but must be one of: "

                    "state was " + mState + " but must be one of: "

                            + "STATE_UNDEFINED(" + STATE_UNDEFINED + "), "

                            + "STATE_ON(" + STATE_ON + "), "

                            + "STATE_ON(" + STATE_ON + "), "

                            + "STATE_OFF(" + STATE_OFF + ")");

                            + "STATE_OFF(" + STATE_OFF + "), "

                            + "STATE_UNDEFINED(" + STATE_UNDEFINED + ")");

        }

        }





        this.charSeq = _charSeq;

        this.charSeq = _charSeq;
@@ -1872,10 +1874,10 @@ public final class SampleDataClass implements Parcelable { 
    }

    }





    @DataClass.Generated(

    @DataClass.Generated(

            time = 1601950879293L,

            time = 1603836845952L,

            codegenVersion = "1.0.16",

            codegenVersion = "1.0.18",

            sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/SampleDataClass.java",

            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)")

            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_ON\npublic static final  int STATE_OFF\npublic static final  int STATE_UNDEFINED\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

    @Deprecated

    private void __metadata() {}

    private void __metadata() {}

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -85,7 +85,7 @@ public class SampleWithCustomBuilder implements Parcelable { 












    // Code below generated by codegen v1.0.16.

    // Code below generated by codegen v1.0.18.

    //

    //

    // DO NOT MODIFY!

    // DO NOT MODIFY!

    // CHECKSTYLE:OFF Generated code

    // CHECKSTYLE:OFF Generated code
@@ -253,8 +253,8 @@ public class SampleWithCustomBuilder implements Parcelable { 
    }

    }





    @DataClass.Generated(

    @DataClass.Generated(

            time = 1601950880290L,

            time = 1603836846970L,

            codegenVersion = "1.0.16",

            codegenVersion = "1.0.18",

            sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/SampleWithCustomBuilder.java",

            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]\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 []\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 []")

            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]\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 []\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

    @Deprecated