diff options
| author | 2024-12-03 23:44:25 +0000 | |
|---|---|---|
| committer | 2024-12-03 23:44:25 +0000 | |
| commit | d7ad686f827b4bf0ce4e0f3a154dfff2806b977f (patch) | |
| tree | 3e73076bdcf9bb55f283c4921e62778fd7b54e26 | |
| parent | 6d9ca16b4a8ba4d45ca9ccd661a2f2ffe7e07a1c (diff) | |
| parent | 22ba998baffff3124fbb878f53985f34f47c46f2 (diff) | |
Merge "Add feature flag for the new role SYSTEM_VENDOR_INTELLIGENCE" into main
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/permission/flags.aconfig | 9 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 5 | ||||
| -rw-r--r-- | core/res/res/values/public-staging.xml | 3 |
4 files changed, 18 insertions, 0 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index a5939700e5aa..8253b52f9a1d 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -550,6 +550,7 @@ package android { field public static final int config_systemTextIntelligence = 17039414; // 0x1040036 field public static final int config_systemUi = 17039418; // 0x104003a field public static final int config_systemUiIntelligence = 17039410; // 0x1040032 + field @FlaggedApi("android.permission.flags.system_vendor_intelligence_role_enabled") public static final int config_systemVendorIntelligence; field public static final int config_systemVisualIntelligence = 17039415; // 0x1040037 field public static final int config_systemWearHealthService = 17039428; // 0x1040044 field public static final int config_systemWellbeing = 17039408; // 0x1040030 diff --git a/core/java/android/permission/flags.aconfig b/core/java/android/permission/flags.aconfig index 57e1b5863a4b..2c4883f1f61c 100644 --- a/core/java/android/permission/flags.aconfig +++ b/core/java/android/permission/flags.aconfig @@ -483,3 +483,12 @@ flag { description: "Rate limit async noteOp callbacks for batched noteOperation binder call" bug: "366013082" } + +flag { + name: "system_vendor_intelligence_role_enabled" + is_exported: true + is_fixed_read_only: true + namespace: "permissions" + description: "This flag is used to enable the role system_vendor_intelligence" + bug: "377553620" +} diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 390fbeaae494..596a9af6171f 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -7276,4 +7276,9 @@ <!-- List of protected packages that require biometric authentication for modification (Disable, force-stop or uninstalling updates). --> <string-array name="config_biometric_protected_package_names" translatable="false" /> + + <!-- Package name of the on-device intelligent processor for vendor specific + features. Examples include the search functionality or the app + predictor. --> + <string name="config_systemVendorIntelligence" translatable="false"></string> </resources> diff --git a/core/res/res/values/public-staging.xml b/core/res/res/values/public-staging.xml index 90f1b8a7046b..7b9d21364aca 100644 --- a/core/res/res/values/public-staging.xml +++ b/core/res/res/values/public-staging.xml @@ -154,6 +154,9 @@ <!-- @FlaggedApi(android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_PLATFORM_API_ENABLED) @hide @SystemApi --> <public name="config_defaultReservedForTestingProfileGroupExclusivity" /> + <!-- @FlaggedApi(android.permission.flags.Flags.FLAG_SYSTEM_VENDOR_INTELLIGENCE_ROLE_ENABLED) + @hide @SystemApi --> + <public name="config_systemVendorIntelligence" /> </staging-public-group> <staging-public-group type="dimen" first-id="0x01b30000"> |