Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future
Bug: 385190204
Merged-In: I472c6dcd6ad3a2511560892e473bef799be43197
Change-Id: I44c743f98175fdb503e9507497793c8906351f1d
diff --git a/Android.bp b/Android.bp
index 7ec9c80..6dcc8ce 100644
--- a/Android.bp
+++ b/Android.bp
@@ -82,6 +82,7 @@
shrink_resources: true,
proguard_compatibility: false,
proguard_flags_files: ["proguard.proguard"],
+ keep_runtime_invisible_annotations: true,
},
privileged: true,
privapp_allowlist: ":privapp_allowlist_android.ext_tplus.services.xml",
@@ -112,6 +113,7 @@
shrink_resources: true,
proguard_compatibility: false,
proguard_flags_files: ["proguard.proguard"],
+ keep_runtime_invisible_annotations: true,
},
privileged: true,
privapp_allowlist: ":privapp_allowlist_android.ext_sminus.services.xml",
diff --git a/OWNERS b/OWNERS
index 2ce48f7..71a31d5 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,6 +1,5 @@
# Bug component: 1101073
[email protected]
[email protected]
# Autofill
include platform/frameworks/base:/core/java/android/service/autofill/OWNERS
# PackageWatchdog
@@ -9,8 +8,6 @@
[email protected]
[email protected]
# TextClassifier
[email protected]
[email protected]
[email protected]
-include platform/packages/modules/common:/MODULES_OWNERS # see go/mainline-owners-policy
\ No newline at end of file
+include platform/packages/modules/common:/MODULES_OWNERS # see go/mainline-owners-policy
diff --git a/jni/OWNERS b/jni/OWNERS
index 52c0a12..54899bf 100644
--- a/jni/OWNERS
+++ b/jni/OWNERS
@@ -1,2 +1 @@
[email protected]
[email protected]
diff --git a/native/OWNERS b/native/OWNERS
index 52c0a12..54899bf 100644
--- a/native/OWNERS
+++ b/native/OWNERS
@@ -1,2 +1 @@
[email protected]
[email protected]
diff --git a/proguard.proguard b/proguard.proguard
index e873931..0cd5be9 100644
--- a/proguard.proguard
+++ b/proguard.proguard
@@ -1,6 +1,8 @@
-keepparameternames
-keepattributes Exceptions,InnerClasses,Signature,Deprecated,
- SourceFile,LineNumberTable,*Annotation*,EnclosingMethod
+ SourceFile,LineNumberTable,EnclosingMethod,
+ RuntimeVisibleAnnotations,RuntimeVisibleParameterAnnotations,
+ RuntimeVisibleTypeAnnotations,AnnotationDefault
# Rules required by TextClassifierServiceLibNoManifest
# Jni classes
