Revert^2 "Introduce a new headless-user-mode attribute"
6953b903c2457a26cd1288691261a2b02ac70a46
NOTE FOR REVIEWERS - original patch and result patch are not identical.
PLEASE REVIEW CAREFULLY.
Diffs between the patches:
name: "device_policy_exported_aconfig_flags_lib",
> - aconfig_declarations: "device_policy_aconfig_flags",
> - defaults: ["framework-minus-apex-aconfig-java-defaults"],
> - mode: "exported",
> -}
> -
> -java_aconfig_library {
> --- core/java/android/app/admin/flags/flags.aconfig
> +++ core/java/android/app/admin/flags/flags.aconfig
> - is_exported: true
Original patch:
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
old mode 100644
new mode 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -1030,18 +1030,10 @@
name: "device_policy_aconfig_flags",
package: "android.app.admin.flags",
container: "system",
- exportable: true,
srcs: [
"core/java/android/app/admin/flags/flags.aconfig",
],
}
-
-java_aconfig_library {
- name: "device_policy_exported_aconfig_flags_lib",
- aconfig_declarations: "device_policy_aconfig_flags",
- defaults: ["framework-minus-apex-aconfig-java-defaults"],
- mode: "exported",
-}
java_aconfig_library {
name: "device_policy_aconfig_flags_lib",
diff --git a/core/java/android/app/admin/flags/flags.aconfig b/core/java/android/app/admin/flags/flags.aconfig
old mode 100644
new mode 100644
--- a/core/java/android/app/admin/flags/flags.aconfig
+++ b/core/java/android/app/admin/flags/flags.aconfig
@@ -309,7 +309,6 @@
namespace: "enterprise"
description: "Fix for compatibility issue introduced fro
[[[Original patch trimmed due to size. Decoded string size: 1172. Decoded string SHA1: 261aeabafee16b48f9e43ce21ee28f4be6436f2c.]]]
Result patch:
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index b650c1c..a42adad 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -1030,20 +1030,12 @@
name: "device_policy_aconfig_flags",
package: "android.app.admin.flags",
container: "system",
- exportable: true,
srcs: [
"core/java/android/app/admin/flags/flags.aconfig",
],
}
java_aconfig_library {
- name: "device_policy_exported_aconfig_flags_lib",
- aconfig_declarations: "device_policy_aconfig_flags",
- defaults: ["framework-minus-apex-aconfig-java-defaults"],
- mode: "exported",
-}
-
-java_aconfig_library {
name: "device_policy_aconfig_flags_lib",
aconfig_declarations: "device_policy_aconfig_flags",
defaults: ["framework-minus-apex-aconfig-java-defaults"],
diff --git a/core/java/android/app/admin/flags/flags.aconfig b/core/java/android/app/admin/flags/flags.aconfig
index 83daa45..93576aef 100644
--- a/core/java/android/app/admin/flags/flags.aconfig
+++ b/core/java/android/app/admin/flags/flags.
[[[Result patch trimmed due to size. Decoded string size: 1291. Decoded string SHA1: 53d6d985ceac329174f1319fbf43613934767e4a.]]]
Change-Id: I854c4eefd0f43bbdcf4d862080277e12dba9602e
3 files changed