Merge "Fix genHiddenConstructor missing @hide" (a74ecc37) · Commits · e / os / android_frameworks_base

tools/codegen/src/com/android/codegen/Generators.kt

+6 −3

Original line number	Diff line number	Diff line
		@@ -5,8 +5,6 @@ import com.github.javaparser.ast.body.MethodDeclaration
		import com.github.javaparser.ast.body.VariableDeclarator
		import com.github.javaparser.ast.expr.AnnotationExpr
		import com.github.javaparser.ast.expr.ArrayInitializerExpr
		import com.github.javaparser.ast.expr.LiteralExpr
		import com.github.javaparser.ast.expr.UnaryExpr
		import java.io.File


		@@ -163,7 +161,12 @@ fun ClassPrinter.generateCopyConstructor() {
		return
		}

		+"/** Copy constructor */"
		+"/**"
		+" * Copy constructor"
		if (FeatureFlag.COPY_CONSTRUCTOR.hidden) {
		+" * @hide"
		}
		+" */"
		+GENERATED_MEMBER_HEADER
		"public $ClassName(@$NonNull $ClassName orig)" {
		fields.forEachApply {

+1 −1

Original line number	Diff line number	Diff line
		package com.android.codegen

		const val CODEGEN_NAME = "codegen"
		const val CODEGEN_VERSION = "1.0.20"
		const val CODEGEN_VERSION = "1.0.21"

		const val CANONICAL_BUILDER_CLASS = "Builder"
		const val BASE_BUILDER_CLASS = "BaseBuilder"