diff options
17 files changed, 127 insertions, 113 deletions
diff --git a/core/java/android/app/AsyncNotedAppOp.java b/core/java/android/app/AsyncNotedAppOp.java index b0c2762c3439..db58c215ffe2 100644 --- a/core/java/android/app/AsyncNotedAppOp.java +++ b/core/java/android/app/AsyncNotedAppOp.java @@ -72,7 +72,7 @@ public final class AsyncNotedAppOp implements Parcelable { - // Code below generated by codegen v1.0.15. + // Code below generated by codegen v1.0.20. // // DO NOT MODIFY! // CHECKSTYLE:OFF Generated code @@ -261,10 +261,10 @@ public final class AsyncNotedAppOp implements Parcelable { }; @DataClass.Generated( - time = 1583866239013L, - codegenVersion = "1.0.15", + time = 1604456255752L, + codegenVersion = "1.0.20", sourceFile = "frameworks/base/core/java/android/app/AsyncNotedAppOp.java", - inputSignatures = "private final @android.annotation.IntRange(from=0L) int mOpCode\nprivate final @android.annotation.IntRange(from=0L) int mNotingUid\nprivate final @android.annotation.Nullable java.lang.String mAttributionTag\nprivate final @android.annotation.NonNull java.lang.String mMessage\nprivate final @android.annotation.CurrentTimeMillisLong long mTime\npublic @android.annotation.NonNull java.lang.String getOp()\nprivate void onConstructed()\nclass AsyncNotedAppOp extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genAidl=true, genHiddenConstructor=true)") + inputSignatures = "private final @android.annotation.IntRange int mOpCode\nprivate final @android.annotation.IntRange int mNotingUid\nprivate final @android.annotation.Nullable java.lang.String mAttributionTag\nprivate final @android.annotation.NonNull java.lang.String mMessage\nprivate final @android.annotation.CurrentTimeMillisLong long mTime\npublic @android.annotation.NonNull java.lang.String getOp()\nprivate void onConstructed()\nclass AsyncNotedAppOp extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genAidl=true, genHiddenConstructor=true)") @Deprecated private void __metadata() {} diff --git a/core/java/android/content/pm/permission/SplitPermissionInfoParcelable.java b/core/java/android/content/pm/permission/SplitPermissionInfoParcelable.java index e7a554ae5726..aea69ad5b885 100644 --- a/core/java/android/content/pm/permission/SplitPermissionInfoParcelable.java +++ b/core/java/android/content/pm/permission/SplitPermissionInfoParcelable.java @@ -59,14 +59,18 @@ public class SplitPermissionInfoParcelable implements Parcelable { - // Code below generated by codegen v1.0.0. + // Code below generated by codegen v1.0.20. // // DO NOT MODIFY! + // CHECKSTYLE:OFF Generated code // // To regenerate run: // $ codegen $ANDROID_BUILD_TOP/frameworks/base/core/java/android/content/pm/permission/SplitPermissionInfoParcelable.java // - // CHECKSTYLE:OFF Generated code + // To exclude the generated code from IntelliJ auto-formatting enable (one-time): + // Settings > Editor > Code Style > Formatter Control + //@formatter:off + /** * Creates a new SplitPermissionInfoParcelable. @@ -154,7 +158,7 @@ public class SplitPermissionInfoParcelable implements Parcelable { @Override @DataClass.Generated.Member - public void writeToParcel(Parcel dest, int flags) { + public void writeToParcel(@NonNull Parcel dest, int flags) { // You can override field parcelling by defining methods like: // void parcelFieldName(Parcel dest, int flags) { ... } @@ -167,6 +171,32 @@ public class SplitPermissionInfoParcelable implements Parcelable { @DataClass.Generated.Member public int describeContents() { return 0; } + /** @hide */ + @SuppressWarnings({"unchecked", "RedundantCast"}) + @DataClass.Generated.Member + protected SplitPermissionInfoParcelable(@NonNull Parcel in) { + // You can override field unparcelling by defining methods like: + // static FieldType unparcelFieldName(Parcel in) { ... } + + String splitPermission = in.readString(); + List<String> newPermissions = new java.util.ArrayList<>(); + in.readStringList(newPermissions); + int targetSdk = in.readInt(); + + this.mSplitPermission = splitPermission; + com.android.internal.util.AnnotationValidations.validate( + NonNull.class, null, mSplitPermission); + this.mNewPermissions = newPermissions; + com.android.internal.util.AnnotationValidations.validate( + NonNull.class, null, mNewPermissions); + this.mTargetSdk = targetSdk; + com.android.internal.util.AnnotationValidations.validate( + IntRange.class, null, mTargetSdk, + "from", 0); + + onConstructed(); + } + @DataClass.Generated.Member public static final @NonNull Parcelable.Creator<SplitPermissionInfoParcelable> CREATOR = new Parcelable.Creator<SplitPermissionInfoParcelable>() { @@ -176,28 +206,21 @@ public class SplitPermissionInfoParcelable implements Parcelable { } @Override - @SuppressWarnings({"unchecked", "RedundantCast"}) - public SplitPermissionInfoParcelable createFromParcel(Parcel in) { - // You can override field unparcelling by defining methods like: - // static FieldType unparcelFieldName(Parcel in) { ... } - - String splitPermission = in.readString(); - List<String> newPermissions = new java.util.ArrayList<>(); - in.readStringList(newPermissions); - int targetSdk = in.readInt(); - return new SplitPermissionInfoParcelable( - splitPermission, - newPermissions, - targetSdk); + public SplitPermissionInfoParcelable createFromParcel(@NonNull Parcel in) { + return new SplitPermissionInfoParcelable(in); } }; @DataClass.Generated( - time = 1567634390477L, - codegenVersion = "1.0.0", + time = 1604456266666L, + codegenVersion = "1.0.20", sourceFile = "frameworks/base/core/java/android/content/pm/permission/SplitPermissionInfoParcelable.java", - inputSignatures = "private final @android.annotation.NonNull java.lang.String mSplitPermission\nprivate final @android.annotation.NonNull java.util.List<java.lang.String> mNewPermissions\nprivate final @android.annotation.IntRange(from=0L) int mTargetSdk\nprivate void onConstructed()\nclass SplitPermissionInfoParcelable extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true)") + inputSignatures = "private final @android.annotation.NonNull java.lang.String mSplitPermission\nprivate final @android.annotation.NonNull java.util.List<java.lang.String> mNewPermissions\nprivate final @android.annotation.IntRange int mTargetSdk\nprivate void onConstructed()\nclass SplitPermissionInfoParcelable extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true)") @Deprecated private void __metadata() {} + + //@formatter:on + // End of generated code + } diff --git a/core/java/android/hardware/display/VirtualDisplayConfig.java b/core/java/android/hardware/display/VirtualDisplayConfig.java index 10e1c7c2e0df..71688c7cc7e8 100644 --- a/core/java/android/hardware/display/VirtualDisplayConfig.java +++ b/core/java/android/hardware/display/VirtualDisplayConfig.java @@ -93,7 +93,7 @@ public final class VirtualDisplayConfig implements Parcelable { - // Code below generated by codegen v1.0.15. + // Code below generated by codegen v1.0.20. // // DO NOT MODIFY! // CHECKSTYLE:OFF Generated code @@ -477,10 +477,10 @@ public final class VirtualDisplayConfig implements Parcelable { } @DataClass.Generated( - time = 1585179350902L, - codegenVersion = "1.0.15", + time = 1604456298440L, + codegenVersion = "1.0.20", sourceFile = "frameworks/base/core/java/android/hardware/display/VirtualDisplayConfig.java", - inputSignatures = "private @android.annotation.NonNull java.lang.String mName\nprivate @android.annotation.IntRange(from=1L) int mWidth\nprivate @android.annotation.IntRange(from=1L) int mHeight\nprivate @android.annotation.IntRange(from=1L) int mDensityDpi\nprivate int mFlags\nprivate @android.annotation.Nullable android.view.Surface mSurface\nprivate @android.annotation.Nullable java.lang.String mUniqueId\nprivate int mDisplayIdToMirror\nclass VirtualDisplayConfig extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genParcelable=true, genAidl=true, genBuilder=true)") + inputSignatures = "private @android.annotation.NonNull java.lang.String mName\nprivate @android.annotation.IntRange int mWidth\nprivate @android.annotation.IntRange int mHeight\nprivate @android.annotation.IntRange int mDensityDpi\nprivate int mFlags\nprivate @android.annotation.Nullable android.view.Surface mSurface\nprivate @android.annotation.Nullable java.lang.String mUniqueId\nprivate int mDisplayIdToMirror\nclass VirtualDisplayConfig extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genParcelable=true, genAidl=true, genBuilder=true)") @Deprecated private void __metadata() {} diff --git a/core/java/android/service/autofill/InlinePresentation.java b/core/java/android/service/autofill/InlinePresentation.java index 6eb2a15eec44..fbf23b69addf 100644 --- a/core/java/android/service/autofill/InlinePresentation.java +++ b/core/java/android/service/autofill/InlinePresentation.java @@ -77,7 +77,7 @@ public final class InlinePresentation implements Parcelable { - // Code below generated by codegen v1.0.15. + // Code below generated by codegen v1.0.20. // // DO NOT MODIFY! // CHECKSTYLE:OFF Generated code @@ -259,10 +259,10 @@ public final class InlinePresentation implements Parcelable { }; @DataClass.Generated( - time = 1596484869201L, - codegenVersion = "1.0.15", + time = 1604456277638L, + codegenVersion = "1.0.20", sourceFile = "frameworks/base/core/java/android/service/autofill/InlinePresentation.java", - inputSignatures = "private final @android.annotation.NonNull android.app.slice.Slice mSlice\nprivate final @android.annotation.NonNull android.widget.inline.InlinePresentationSpec mInlinePresentationSpec\nprivate final boolean mPinned\npublic @android.annotation.NonNull @android.annotation.Size(min=0L) java.lang.String[] getAutofillHints()\nclass InlinePresentation extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genToString=true, genHiddenConstDefs=true, genEqualsHashCode=true)") + inputSignatures = "private final @android.annotation.NonNull android.app.slice.Slice mSlice\nprivate final @android.annotation.NonNull android.widget.inline.InlinePresentationSpec mInlinePresentationSpec\nprivate final boolean mPinned\npublic @android.annotation.NonNull @android.annotation.Size java.lang.String[] getAutofillHints()\nclass InlinePresentation extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genToString=true, genHiddenConstDefs=true, genEqualsHashCode=true)") @Deprecated private void __metadata() {} diff --git a/core/java/android/view/VerifiedKeyEvent.java b/core/java/android/view/VerifiedKeyEvent.java index dc5b7cc1e13a..77a7d0944521 100644 --- a/core/java/android/view/VerifiedKeyEvent.java +++ b/core/java/android/view/VerifiedKeyEvent.java @@ -137,11 +137,10 @@ public final class VerifiedKeyEvent extends VerifiedInputEvent implements Parcel // 3. add the "super" call for constructor that receives a Parcel // 4. add the "super" call to the writeToParcel method // 5. Update "equals" and "hashcode" methods to include VerifiedInputEvent fields - // 6. Edit "inputSignatures" to ensure KeyEventAction is properly qualified - // Code below generated by codegen v1.0.14. + // Code below generated by codegen v1.0.20. // // DO NOT MODIFY! // CHECKSTYLE:OFF Generated code @@ -180,14 +179,13 @@ public final class VerifiedKeyEvent extends VerifiedInputEvent implements Parcel * this is the number of down/up pairs that have occurred. * @hide */ - @DataClass.Generated.Member public VerifiedKeyEvent( int deviceId, long eventTimeNanos, int source, int displayId, @KeyEventAction int action, - @SuppressLint({"MethodNameUnits"}) long downTimeNanos, + @SuppressLint({ "MethodNameUnits" }) long downTimeNanos, int flags, int keyCode, int scanCode, @@ -198,16 +196,11 @@ public final class VerifiedKeyEvent extends VerifiedInputEvent implements Parcel com.android.internal.util.AnnotationValidations.validate( KeyEventAction.class, null, mAction); this.mDownTimeNanos = downTimeNanos; - com.android.internal.util.AnnotationValidations.validate( - SuppressLint.class, null, mDownTimeNanos, - "value", "MethodNameUnits"); this.mFlags = flags; this.mKeyCode = keyCode; this.mScanCode = scanCode; this.mMetaState = metaState; this.mRepeatCount = repeatCount; - - // onConstructed(); // You can define this method to get a callback } /** @@ -229,7 +222,7 @@ public final class VerifiedKeyEvent extends VerifiedInputEvent implements Parcel * @see KeyEvent#getDownTime() */ @DataClass.Generated.Member - public @SuppressLint({"MethodNameUnits"}) long getDownTimeNanos() { + public @SuppressLint({ "MethodNameUnits" }) long getDownTimeNanos() { return mDownTimeNanos; } @@ -301,10 +294,7 @@ public final class VerifiedKeyEvent extends VerifiedInputEvent implements Parcel VerifiedKeyEvent that = (VerifiedKeyEvent) o; //noinspection PointlessBooleanExpression return true - && getDeviceId() == that.getDeviceId() - && getEventTimeNanos() == that.getEventTimeNanos() - && getSource() == that.getSource() - && getDisplayId() == that.getDisplayId() + && super.equals(that) && mAction == that.mAction && mDownTimeNanos == that.mDownTimeNanos && mFlags == that.mFlags @@ -321,10 +311,7 @@ public final class VerifiedKeyEvent extends VerifiedInputEvent implements Parcel // int fieldNameHashCode() { ... } int _hash = 1; - _hash = 31 * _hash + getDeviceId(); - _hash = 31 * _hash + Long.hashCode(getEventTimeNanos()); - _hash = 31 * _hash + getSource(); - _hash = 31 * _hash + getDisplayId(); + _hash = 31 * _hash + super.hashCode(); _hash = 31 * _hash + mAction; _hash = 31 * _hash + Long.hashCode(mDownTimeNanos); _hash = 31 * _hash + mFlags; @@ -341,6 +328,7 @@ public final class VerifiedKeyEvent extends VerifiedInputEvent implements Parcel // You can override field parcelling by defining methods like: // void parcelFieldName(Parcel dest, int flags) { ... } super.writeToParcel(dest, flags); + dest.writeInt(mAction); dest.writeLong(mDownTimeNanos); dest.writeInt(mFlags); @@ -361,6 +349,7 @@ public final class VerifiedKeyEvent extends VerifiedInputEvent implements Parcel // You can override field unparcelling by defining methods like: // static FieldType unparcelFieldName(Parcel in) { ... } super(in, VERIFIED_KEY); + int action = in.readInt(); long downTimeNanos = in.readLong(); int flags = in.readInt(); @@ -373,9 +362,6 @@ public final class VerifiedKeyEvent extends VerifiedInputEvent implements Parcel com.android.internal.util.AnnotationValidations.validate( KeyEventAction.class, null, mAction); this.mDownTimeNanos = downTimeNanos; - com.android.internal.util.AnnotationValidations.validate( - SuppressLint.class, null, mDownTimeNanos, - "value", "MethodNameUnits"); this.mFlags = flags; this.mKeyCode = keyCode; this.mScanCode = scanCode; @@ -400,10 +386,10 @@ public final class VerifiedKeyEvent extends VerifiedInputEvent implements Parcel }; @DataClass.Generated( - time = 1581107066890L, - codegenVersion = "1.0.14", + time = 1604509197793L, + codegenVersion = "1.0.20", sourceFile = "frameworks/base/core/java/android/view/VerifiedKeyEvent.java", - inputSignatures = "private static final java.lang.String TAG\nprivate @android.view.VerifiedKeyEvent.KeyEventAction int mAction\nprivate @android.annotation.SuppressLint({\"MethodNameUnits\"}) long mDownTimeNanos\nprivate int mFlags\nprivate int mKeyCode\nprivate int mScanCode\nprivate int mMetaState\nprivate int mRepeatCount\npublic @android.annotation.Nullable java.lang.Boolean getFlag(int)\nclass VerifiedKeyEvent extends android.view.VerifiedInputEvent implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genHiddenConstructor=true, genEqualsHashCode=true)") + inputSignatures = "private static final java.lang.String TAG\nprivate @android.view.VerifiedKeyEvent.KeyEventAction int mAction\nprivate @android.annotation.SuppressLint long mDownTimeNanos\nprivate int mFlags\nprivate int mKeyCode\nprivate int mScanCode\nprivate int mMetaState\nprivate int mRepeatCount\npublic @android.annotation.Nullable java.lang.Boolean getFlag(int)\nclass VerifiedKeyEvent extends android.view.VerifiedInputEvent implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genHiddenConstructor=true, genEqualsHashCode=true)") @Deprecated private void __metadata() {} diff --git a/core/java/android/view/VerifiedMotionEvent.java b/core/java/android/view/VerifiedMotionEvent.java index b4c5d24775ea..7d8345928bf0 100644 --- a/core/java/android/view/VerifiedMotionEvent.java +++ b/core/java/android/view/VerifiedMotionEvent.java @@ -131,11 +131,10 @@ public final class VerifiedMotionEvent extends VerifiedInputEvent implements Par // 3. add the "super" call for constructor that receives a Parcel // 4. add the "super" call to the writeToParcel method // 5. Update "equals" and "hashcode" methods to include VerifiedInputEvent fields - // 6. Edit "inputSignatures" to ensure MotionEventAction is properly qualified - // Code below generated by codegen v1.0.14. + // Code below generated by codegen v1.0.20. // // DO NOT MODIFY! // CHECKSTYLE:OFF Generated code @@ -174,7 +173,7 @@ public final class VerifiedMotionEvent extends VerifiedInputEvent implements Par float rawX, float rawY, @MotionEventAction int actionMasked, - @SuppressLint({"MethodNameUnits"}) long downTimeNanos, + @SuppressLint({ "MethodNameUnits" }) long downTimeNanos, int flags, int metaState, int buttonState) { @@ -185,9 +184,6 @@ public final class VerifiedMotionEvent extends VerifiedInputEvent implements Par com.android.internal.util.AnnotationValidations.validate( MotionEventAction.class, null, mActionMasked); this.mDownTimeNanos = downTimeNanos; - com.android.internal.util.AnnotationValidations.validate( - SuppressLint.class, null, mDownTimeNanos, - "value", "MethodNameUnits"); this.mFlags = flags; this.mMetaState = metaState; this.mButtonState = buttonState; @@ -232,7 +228,7 @@ public final class VerifiedMotionEvent extends VerifiedInputEvent implements Par * @see MotionEvent#getDownTime() */ @DataClass.Generated.Member - public @SuppressLint({"MethodNameUnits"}) long getDownTimeNanos() { + public @SuppressLint({ "MethodNameUnits" }) long getDownTimeNanos() { return mDownTimeNanos; } @@ -280,10 +276,7 @@ public final class VerifiedMotionEvent extends VerifiedInputEvent implements Par VerifiedMotionEvent that = (VerifiedMotionEvent) o; //noinspection PointlessBooleanExpression return true - && getDeviceId() == that.getDeviceId() - && getEventTimeNanos() == that.getEventTimeNanos() - && getSource() == that.getSource() - && getDisplayId() == that.getDisplayId() + && super.equals(that) && mRawX == that.mRawX && mRawY == that.mRawY && mActionMasked == that.mActionMasked @@ -300,10 +293,7 @@ public final class VerifiedMotionEvent extends VerifiedInputEvent implements Par // int fieldNameHashCode() { ... } int _hash = 1; - _hash = 31 * _hash + getDeviceId(); - _hash = 31 * _hash + Long.hashCode(getEventTimeNanos()); - _hash = 31 * _hash + getSource(); - _hash = 31 * _hash + getDisplayId(); + _hash = 31 * _hash + super.hashCode(); _hash = 31 * _hash + Float.hashCode(mRawX); _hash = 31 * _hash + Float.hashCode(mRawY); _hash = 31 * _hash + mActionMasked; @@ -320,6 +310,7 @@ public final class VerifiedMotionEvent extends VerifiedInputEvent implements Par // You can override field parcelling by defining methods like: // void parcelFieldName(Parcel dest, int flags) { ... } super.writeToParcel(dest, flags); + dest.writeFloat(mRawX); dest.writeFloat(mRawY); dest.writeInt(mActionMasked); @@ -340,6 +331,7 @@ public final class VerifiedMotionEvent extends VerifiedInputEvent implements Par // You can override field unparcelling by defining methods like: // static FieldType unparcelFieldName(Parcel in) { ... } super(in, VERIFIED_MOTION); + float rawX = in.readFloat(); float rawY = in.readFloat(); int actionMasked = in.readInt(); @@ -354,9 +346,6 @@ public final class VerifiedMotionEvent extends VerifiedInputEvent implements Par com.android.internal.util.AnnotationValidations.validate( MotionEventAction.class, null, mActionMasked); this.mDownTimeNanos = downTimeNanos; - com.android.internal.util.AnnotationValidations.validate( - SuppressLint.class, null, mDownTimeNanos, - "value", "MethodNameUnits"); this.mFlags = flags; this.mMetaState = metaState; this.mButtonState = buttonState; @@ -379,10 +368,10 @@ public final class VerifiedMotionEvent extends VerifiedInputEvent implements Par }; @DataClass.Generated( - time = 1581107073238L, - codegenVersion = "1.0.14", + time = 1604509199368L, + codegenVersion = "1.0.20", sourceFile = "frameworks/base/core/java/android/view/VerifiedMotionEvent.java", - inputSignatures = "private static final java.lang.String TAG\nprivate float mRawX\nprivate float mRawY\nprivate @android.view.VerifiedMotionEvent.MotionEventAction int mActionMasked\nprivate @android.annotation.SuppressLint({\"MethodNameUnits\"}) long mDownTimeNanos\nprivate int mFlags\nprivate int mMetaState\nprivate int mButtonState\npublic @android.annotation.Nullable java.lang.Boolean getFlag(int)\nclass VerifiedMotionEvent extends android.view.VerifiedInputEvent implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genHiddenConstructor=true, genEqualsHashCode=true)") + inputSignatures = "private static final java.lang.String TAG\nprivate float mRawX\nprivate float mRawY\nprivate @android.view.VerifiedMotionEvent.MotionEventAction int mActionMasked\nprivate @android.annotation.SuppressLint long mDownTimeNanos\nprivate int mFlags\nprivate int mMetaState\nprivate int mButtonState\npublic @android.annotation.Nullable java.lang.Boolean getFlag(int)\nclass VerifiedMotionEvent extends android.view.VerifiedInputEvent implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genHiddenConstructor=true, genEqualsHashCode=true)") @Deprecated private void __metadata() {} diff --git a/core/java/android/view/inputmethod/InlineSuggestionInfo.java b/core/java/android/view/inputmethod/InlineSuggestionInfo.java index 1c703ecf06ca..73962d7f65e0 100644 --- a/core/java/android/view/inputmethod/InlineSuggestionInfo.java +++ b/core/java/android/view/inputmethod/InlineSuggestionInfo.java @@ -88,7 +88,7 @@ public final class InlineSuggestionInfo implements Parcelable { - // Code below generated by codegen v1.0.15. + // Code below generated by codegen v1.0.20. // // DO NOT MODIFY! // CHECKSTYLE:OFF Generated code @@ -346,10 +346,10 @@ public final class InlineSuggestionInfo implements Parcelable { }; @DataClass.Generated( - time = 1586992414034L, - codegenVersion = "1.0.15", + time = 1604456249219L, + codegenVersion = "1.0.20", sourceFile = "frameworks/base/core/java/android/view/inputmethod/InlineSuggestionInfo.java", - inputSignatures = "public static final @android.view.inputmethod.InlineSuggestionInfo.Source java.lang.String SOURCE_AUTOFILL\npublic static final @android.view.inputmethod.InlineSuggestionInfo.Source java.lang.String SOURCE_PLATFORM\npublic static final @android.view.inputmethod.InlineSuggestionInfo.Type java.lang.String TYPE_SUGGESTION\npublic static final @android.annotation.SuppressLint({\"IntentName\"}) @android.view.inputmethod.InlineSuggestionInfo.Type java.lang.String TYPE_ACTION\nprivate final @android.annotation.NonNull android.widget.inline.InlinePresentationSpec mInlinePresentationSpec\nprivate final @android.annotation.NonNull @android.view.inputmethod.InlineSuggestionInfo.Source java.lang.String mSource\nprivate final @android.annotation.Nullable java.lang.String[] mAutofillHints\nprivate final @android.annotation.NonNull @android.view.inputmethod.InlineSuggestionInfo.Type java.lang.String mType\nprivate final boolean mPinned\npublic static @android.annotation.TestApi @android.annotation.NonNull android.view.inputmethod.InlineSuggestionInfo newInlineSuggestionInfo(android.widget.inline.InlinePresentationSpec,java.lang.String,java.lang.String[],java.lang.String,boolean)\nclass InlineSuggestionInfo extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genHiddenConstDefs=true, genHiddenConstructor=true)") + inputSignatures = "public static final @android.view.inputmethod.InlineSuggestionInfo.Source java.lang.String SOURCE_AUTOFILL\npublic static final @android.view.inputmethod.InlineSuggestionInfo.Source java.lang.String SOURCE_PLATFORM\npublic static final @android.view.inputmethod.InlineSuggestionInfo.Type java.lang.String TYPE_SUGGESTION\npublic static final @android.annotation.SuppressLint @android.view.inputmethod.InlineSuggestionInfo.Type java.lang.String TYPE_ACTION\nprivate final @android.annotation.NonNull android.widget.inline.InlinePresentationSpec mInlinePresentationSpec\nprivate final @android.annotation.NonNull @android.view.inputmethod.InlineSuggestionInfo.Source java.lang.String mSource\nprivate final @android.annotation.Nullable java.lang.String[] mAutofillHints\nprivate final @android.annotation.NonNull @android.view.inputmethod.InlineSuggestionInfo.Type java.lang.String mType\nprivate final boolean mPinned\npublic static @android.annotation.TestApi @android.annotation.NonNull android.view.inputmethod.InlineSuggestionInfo newInlineSuggestionInfo(android.widget.inline.InlinePresentationSpec,java.lang.String,java.lang.String[],java.lang.String,boolean)\nclass InlineSuggestionInfo extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genHiddenConstDefs=true, genHiddenConstructor=true)") @Deprecated private void __metadata() {} diff --git a/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java b/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java index 322bbffe5be2..f49d4fcab5f2 100644 --- a/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java +++ b/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java @@ -32,7 +32,7 @@ public class HierrarchicalDataClassBase implements Parcelable { - // Code below generated by codegen v1.0.19. + // Code below generated by codegen v1.0.20. // // DO NOT MODIFY! // CHECKSTYLE:OFF Generated code @@ -98,8 +98,8 @@ public class HierrarchicalDataClassBase implements Parcelable { }; @DataClass.Generated( - time = 1604435620553L, - codegenVersion = "1.0.19", + time = 1604522375155L, + codegenVersion = "1.0.20", 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 diff --git a/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassChild.java b/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassChild.java index a8ae72deba3d..e8cce23fa324 100644 --- a/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassChild.java +++ b/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassChild.java @@ -46,7 +46,7 @@ public class HierrarchicalDataClassChild extends HierrarchicalDataClassBase { - // Code below generated by codegen v1.0.19. + // Code below generated by codegen v1.0.20. // // DO NOT MODIFY! // CHECKSTYLE:OFF Generated code @@ -120,8 +120,8 @@ public class HierrarchicalDataClassChild extends HierrarchicalDataClassBase { }; @DataClass.Generated( - time = 1604435621500L, - codegenVersion = "1.0.19", + time = 1604522376059L, + codegenVersion = "1.0.20", 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 diff --git a/tests/Codegen/src/com/android/codegentest/ParcelAllTheThingsDataClass.java b/tests/Codegen/src/com/android/codegentest/ParcelAllTheThingsDataClass.java index ca4278df4da7..9de65522fccd 100644 --- a/tests/Codegen/src/com/android/codegentest/ParcelAllTheThingsDataClass.java +++ b/tests/Codegen/src/com/android/codegentest/ParcelAllTheThingsDataClass.java @@ -54,7 +54,7 @@ public class ParcelAllTheThingsDataClass implements Parcelable { - // Code below generated by codegen v1.0.19. + // Code below generated by codegen v1.0.20. // // DO NOT MODIFY! // CHECKSTYLE:OFF Generated code @@ -412,10 +412,10 @@ public class ParcelAllTheThingsDataClass implements Parcelable { } @DataClass.Generated( - time = 1604435619612L, - codegenVersion = "1.0.19", + time = 1604522374190L, + codegenVersion = "1.0.20", 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 @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() {} diff --git a/tests/Codegen/src/com/android/codegentest/SampleDataClass.java b/tests/Codegen/src/com/android/codegentest/SampleDataClass.java index ce1e043a2cd7..5a3e273275ed 100644 --- a/tests/Codegen/src/com/android/codegentest/SampleDataClass.java +++ b/tests/Codegen/src/com/android/codegentest/SampleDataClass.java @@ -344,7 +344,7 @@ public final class SampleDataClass implements Parcelable { - // Code below generated by codegen v1.0.19. + // Code below generated by codegen v1.0.20. // // DO NOT MODIFY! // CHECKSTYLE:OFF Generated code @@ -1874,10 +1874,10 @@ public final class SampleDataClass implements Parcelable { } @DataClass.Generated( - time = 1604435617581L, - codegenVersion = "1.0.19", + time = 1604522372172L, + codegenVersion = "1.0.20", 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_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)") + 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 int mDayOfWeek\nprivate @android.annotation.Size @android.annotation.NonNull @com.android.internal.util.DataClass.Each @android.annotation.FloatRange 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 private void __metadata() {} diff --git a/tests/Codegen/src/com/android/codegentest/SampleWithCustomBuilder.java b/tests/Codegen/src/com/android/codegentest/SampleWithCustomBuilder.java index 5bbbf41184d4..3ab34452f9fc 100644 --- a/tests/Codegen/src/com/android/codegentest/SampleWithCustomBuilder.java +++ b/tests/Codegen/src/com/android/codegentest/SampleWithCustomBuilder.java @@ -85,7 +85,7 @@ public class SampleWithCustomBuilder implements Parcelable { - // Code below generated by codegen v1.0.19. + // Code below generated by codegen v1.0.20. // // DO NOT MODIFY! // CHECKSTYLE:OFF Generated code @@ -253,8 +253,8 @@ public class SampleWithCustomBuilder implements Parcelable { } @DataClass.Generated( - time = 1604435618584L, - codegenVersion = "1.0.19", + time = 1604522373190L, + codegenVersion = "1.0.20", 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 []") @Deprecated diff --git a/tests/Codegen/src/com/android/codegentest/SampleWithNestedDataClasses.java b/tests/Codegen/src/com/android/codegentest/SampleWithNestedDataClasses.java index c76216496fd8..8901cac1cb1b 100644 --- a/tests/Codegen/src/com/android/codegentest/SampleWithNestedDataClasses.java +++ b/tests/Codegen/src/com/android/codegentest/SampleWithNestedDataClasses.java @@ -36,7 +36,7 @@ public class SampleWithNestedDataClasses { - // Code below generated by codegen v1.0.19. + // Code below generated by codegen v1.0.20. // // DO NOT MODIFY! // CHECKSTYLE:OFF Generated code @@ -135,8 +135,8 @@ public class SampleWithNestedDataClasses { }; @DataClass.Generated( - time = 1604435623368L, - codegenVersion = "1.0.19", + time = 1604522377998L, + codegenVersion = "1.0.20", sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/SampleWithNestedDataClasses.java", inputSignatures = " @android.annotation.NonNull java.lang.String mBar\nclass NestedDataClass extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true)") @Deprecated @@ -160,7 +160,7 @@ public class SampleWithNestedDataClasses { - // Code below generated by codegen v1.0.19. + // Code below generated by codegen v1.0.20. // // DO NOT MODIFY! // CHECKSTYLE:OFF Generated code @@ -259,8 +259,8 @@ public class SampleWithNestedDataClasses { }; @DataClass.Generated( - time = 1604435623377L, - codegenVersion = "1.0.19", + time = 1604522378007L, + codegenVersion = "1.0.20", sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/SampleWithNestedDataClasses.java", inputSignatures = " @android.annotation.NonNull long mBaz2\nclass NestedDataClass3 extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true)") @Deprecated @@ -274,7 +274,7 @@ public class SampleWithNestedDataClasses { - // Code below generated by codegen v1.0.19. + // Code below generated by codegen v1.0.20. // // DO NOT MODIFY! // CHECKSTYLE:OFF Generated code @@ -373,8 +373,8 @@ public class SampleWithNestedDataClasses { }; @DataClass.Generated( - time = 1604435623381L, - codegenVersion = "1.0.19", + time = 1604522378015L, + codegenVersion = "1.0.20", sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/SampleWithNestedDataClasses.java", inputSignatures = " @android.annotation.NonNull java.lang.String mBaz\nclass NestedDataClass2 extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true)") @Deprecated diff --git a/tests/Codegen/src/com/android/codegentest/StaleDataclassDetectorFalsePositivesTest.java b/tests/Codegen/src/com/android/codegentest/StaleDataclassDetectorFalsePositivesTest.java index 0813dbe411c7..ac776f3c2764 100644 --- a/tests/Codegen/src/com/android/codegentest/StaleDataclassDetectorFalsePositivesTest.java +++ b/tests/Codegen/src/com/android/codegentest/StaleDataclassDetectorFalsePositivesTest.java @@ -15,8 +15,10 @@ */ package com.android.codegentest; +import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; +import android.content.pm.PackageManager; import com.android.internal.util.DataClass; @@ -57,9 +59,12 @@ public class StaleDataclassDetectorFalsePositivesTest { /** Unrelated methods should be noted, without triggering staleness false positives */ public @NonNull String someMethod(int param) { return null; } + /** Inlined constants in annotation args should be fine */ + private @IntRange(from = PackageManager.PERMISSION_GRANTED) void annotatedWithConstArg() {} - // Code below generated by codegen v1.0.19. + + // Code below generated by codegen v1.0.20. // // DO NOT MODIFY! // CHECKSTYLE:OFF Generated code @@ -84,10 +89,10 @@ public class StaleDataclassDetectorFalsePositivesTest { } @DataClass.Generated( - time = 1604435622426L, - codegenVersion = "1.0.19", + time = 1604522377011L, + codegenVersion = "1.0.20", sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/StaleDataclassDetectorFalsePositivesTest.java", - inputSignatures = "private @android.annotation.Nullable java.util.List<java.util.Set<?>> mUsesWildcards\npublic @android.annotation.NonNull java.lang.String someMethod(int)\nclass StaleDataclassDetectorFalsePositivesTest extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genConstructor=false, genBuilder=false)") + inputSignatures = "private @android.annotation.Nullable java.util.List<java.util.Set<?>> mUsesWildcards\npublic @android.annotation.NonNull java.lang.String someMethod(int)\nprivate @android.annotation.IntRange void annotatedWithConstArg()\nclass StaleDataclassDetectorFalsePositivesTest extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genConstructor=false, genBuilder=false)") @Deprecated private void __metadata() {} diff --git a/tools/codegen/src/com/android/codegen/InputSignaturesComputation.kt b/tools/codegen/src/com/android/codegen/InputSignaturesComputation.kt index 1aea57514855..83108e5ae109 100644 --- a/tools/codegen/src/com/android/codegen/InputSignaturesComputation.kt +++ b/tools/codegen/src/com/android/codegen/InputSignaturesComputation.kt @@ -63,6 +63,7 @@ private fun ClassPrinter.annotationToString(ann: AnnotationExpr?): String { append("@") append(getFullClassName(ann.nameAsString)) if (ann is MarkerAnnotationExpr) return@buildString + if (!ann.nameAsString.startsWith("DataClass")) return@buildString append("(") diff --git a/tools/codegen/src/com/android/codegen/SharedConstants.kt b/tools/codegen/src/com/android/codegen/SharedConstants.kt index 147f18c35e5c..2e176c3d3bec 100644 --- a/tools/codegen/src/com/android/codegen/SharedConstants.kt +++ b/tools/codegen/src/com/android/codegen/SharedConstants.kt @@ -1,7 +1,7 @@ package com.android.codegen const val CODEGEN_NAME = "codegen" -const val CODEGEN_VERSION = "1.0.19" +const val CODEGEN_VERSION = "1.0.20" const val CANONICAL_BUILDER_CLASS = "Builder" const val BASE_BUILDER_CLASS = "BaseBuilder" diff --git a/tools/processors/staledataclass/src/android/processor/staledataclass/StaleDataclassProcessor.kt b/tools/processors/staledataclass/src/android/processor/staledataclass/StaleDataclassProcessor.kt index 51faa49a86cc..1aec9b812e61 100644 --- a/tools/processors/staledataclass/src/android/processor/staledataclass/StaleDataclassProcessor.kt +++ b/tools/processors/staledataclass/src/android/processor/staledataclass/StaleDataclassProcessor.kt @@ -98,8 +98,10 @@ class StaleDataclassProcessor: AbstractProcessor() { private fun elemToString(elem: Element): String { return buildString { - append(elem.modifiers.joinToString(" ") { it.name.toLowerCase() }).append(" ") - append(elem.annotationMirrors.joinToString(" ")).append(" ") + append(elem.modifiers.joinToString(" ") { it.name.toLowerCase() }) + append(" ") + append(elem.annotationMirrors.joinToString(" ", transform = { annotationToString(it) })) + append(" ") if (elem is Symbol) { if (elem.type is Type.MethodType) { append((elem.type as Type.MethodType).returnType) @@ -112,6 +114,14 @@ class StaleDataclassProcessor: AbstractProcessor() { } } + private fun annotationToString(ann: AnnotationMirror): String { + return if (ann.annotationType.toString().startsWith("com.android.internal.util.DataClass")) { + ann.toString() + } else { + ann.toString().substringBefore("(") + } + } + private fun processSingleFile(elementAnnotatedWithGenerated: Element) { val classElement = elementAnnotatedWithGenerated.enclosingElement |