Revert^2 "Fail adb install on external profile errors."
Revert submission 24993368-revert-24773688-dm-profile-validation-SONEGLGSYT
Reason for revert: Relanding the changes with flags
Reverted changes: /q/submissionid:24993368-revert-24773688-dm-profile-validation-SONEGLGSYT
Bug: 278080573
Change-Id: Ia60b7572ea9c9bafe39c63ec1ed5fe432781e04f
Merged-In: I51f45cfa216b15f6c355bfba6ddc4ca620cdf0ae
(cherry picked from commit e424064f12fb4fe91ba721b1a9f2277a2892c630 with modifications)
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index f0b7598..f2cae097 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -13,6 +13,7 @@
// limitations under the License.
aconfig_srcjars = [
+ ":android.content.pm.flags-aconfig-java{.generated_srcjars}",
":android.hardware.biometrics.flags-aconfig-java{.generated_srcjars}",
":android.nfc.flags-aconfig-java{.generated_srcjars}",
":android.os.flags-aconfig-java{.generated_srcjars}",
@@ -145,6 +146,26 @@
defaults: ["framework-minus-apex-aconfig-java-defaults"],
}
+// Package Manager
+aconfig_declarations {
+ name: "android.content.pm.flags-aconfig",
+ package: "android.content.pm",
+ srcs: ["core/java/android/content/pm/flags.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.content.pm.flags-aconfig-java",
+ aconfig_declarations: "android.content.pm.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+java_aconfig_library {
+ name: "android.content.pm.flags-aconfig-java-host",
+ aconfig_declarations: "android.content.pm.flags-aconfig",
+ host_supported: true,
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
// Biometrics
aconfig_declarations {
name: "android.hardware.biometrics.flags-aconfig",