diff options
| author | 2023-07-07 06:42:56 +0000 | |
|---|---|---|
| committer | 2023-07-07 06:42:56 +0000 | |
| commit | 0e513fb0733720791af1d0d49323db9b3bdeff8d (patch) | |
| tree | f23604b99c65a32a7eb6672a89ff73801b0fff47 | |
| parent | dc180e5e1a0f1036ffc2d3a04f07e5c6f5b36b4a (diff) | |
| parent | 1c585f0e0b377e2ac6b6d061b2ee67751b883e2a (diff) | |
Merge "Add defaultRetailDemo config for the default holder of Retail Demo role." into main
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/public-staging.xml | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index cf24f201315c..6a71788eeb9b 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -455,6 +455,7 @@ package android { field public static final int config_defaultCallScreening = 17039398; // 0x1040026 field public static final int config_defaultDialer = 17039395; // 0x1040023 field public static final int config_defaultNotes = 17039429; // 0x1040045 + field public static final int config_defaultRetailDemo; field public static final int config_defaultSms = 17039396; // 0x1040024 field public static final int config_devicePolicyManagement = 17039421; // 0x104003d field public static final int config_feedbackIntentExtraKey = 17039391; // 0x104001f diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 44e3640ce58a..21c993842f94 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2309,6 +2309,8 @@ <string name="config_systemFinancedDeviceController" translatable="false">com.android.devicelockcontroller</string> <!-- The name of the package that will hold the call streaming role. --> <string name="config_systemCallStreaming" translatable="false"></string> + <!-- The name of the package that will hold the default retail demo role. --> + <string name="config_defaultRetailDemo" translatable="false"></string> <!-- The component name of the wear service class that will be started by the system server. --> <string name="config_wearServiceComponent" translatable="false"></string> diff --git a/core/res/res/values/public-staging.xml b/core/res/res/values/public-staging.xml index 49a19407e59f..adc7fe0922aa 100644 --- a/core/res/res/values/public-staging.xml +++ b/core/res/res/values/public-staging.xml @@ -119,6 +119,8 @@ </staging-public-group> <staging-public-group type="string" first-id="0x01ba0000"> + <!-- @hide @SystemApi --> + <public name="config_defaultRetailDemo" /> </staging-public-group> <staging-public-group type="dimen" first-id="0x01b90000"> |