From 4150960e2dc514213f14749f1080df68335a3081 Mon Sep 17 00:00:00 2001 From: Eugene Susla Date: Tue, 27 Oct 2020 14:33:39 -0700 Subject: Relax literal initializer requirement when codegen detects constants Test: . frameworks/base/tests/Codegen/runTest.sh Fixes: 158195639 Change-Id: I93bdea18f348aeca896a9fd619bef2d65704bb41 --- .../src/com/android/codegentest/HierrarchicalDataClassBase.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java') diff --git a/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java b/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java index 66e44e123c7e..1adbc2dc182c 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.16. + // Code below generated by codegen v1.0.18. // // DO NOT MODIFY! // CHECKSTYLE:OFF Generated code @@ -51,7 +51,7 @@ public class HierrarchicalDataClassBase implements Parcelable { } @DataClass.Generated.Member - public HierrarchicalDataClassBase setBaseData( int value) { + public @android.annotation.NonNull HierrarchicalDataClassBase setBaseData( int value) { mBaseData = value; return this; } @@ -98,8 +98,8 @@ public class HierrarchicalDataClassBase implements Parcelable { }; @DataClass.Generated( - time = 1601950882280L, - codegenVersion = "1.0.16", + time = 1603836848866L, + codegenVersion = "1.0.18", 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 -- cgit v1.2.3 From 963ebe9569eed416cfa0857f9e51a217aa38589a Mon Sep 17 00:00:00 2001 From: Eugene Susla Date: Tue, 3 Nov 2020 12:25:08 -0800 Subject: Fix signature generation for nested annotaions Test: . frameworks/base/tests/Codegen/runTest.sh Change-Id: I240e1ab757c2d6efd6afbcf33b6a292eed4ea398 --- .../src/com/android/codegentest/HierrarchicalDataClassBase.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java') diff --git a/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java b/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java index 1adbc2dc182c..322bbffe5be2 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.18. + // Code below generated by codegen v1.0.19. // // DO NOT MODIFY! // CHECKSTYLE:OFF Generated code @@ -98,8 +98,8 @@ public class HierrarchicalDataClassBase implements Parcelable { }; @DataClass.Generated( - time = 1603836848866L, - codegenVersion = "1.0.18", + time = 1604435620553L, + codegenVersion = "1.0.19", 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 -- cgit v1.2.3