diff options
Diffstat (limited to 'core/res')
-rw-r--r-- | core/res/AndroidManifest.xml | 13 | ||||
-rw-r--r-- | core/res/res/values/attrs_manifest.xml | 13 | ||||
-rw-r--r-- | core/res/res/values/config.xml | 3 | ||||
-rw-r--r-- | core/res/res/values/public.xml | 2 | ||||
-rw-r--r-- | core/res/res/values/symbols.xml | 1 |
5 files changed, 31 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index d1e6111dc35f..dc935c09ad8f 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1270,11 +1270,13 @@ android:protectionLevel="dangerous|instant" /> <!-- ====================================================================== --> - <!-- Permissions for accessing the UCE Service --> + <!-- Permissions for accessing the vendor UCE Service --> <!-- ====================================================================== --> <!-- @hide Allows an application to Access UCE-Presence. <p>Protection level: signature|privileged + @deprecated Framework should no longer use this permission to access the vendor UCE service + using AIDL, it is instead implemented by RcsCapabilityExchangeImplBase --> <permission android:name="android.permission.ACCESS_UCE_PRESENCE_SERVICE" android:permissionGroup="android.permission-group.PHONE" @@ -1282,6 +1284,8 @@ <!-- @hide Allows an application to Access UCE-OPTIONS. <p>Protection level: signature|privileged + @deprecated Framework should no longer use this permission to access the vendor UCE service + using AIDL, it is instead implemented by RcsCapabilityExchangeImplBase --> <permission android:name="android.permission.ACCESS_UCE_OPTIONS_SERVICE" android:permissionGroup="android.permission-group.PHONE" @@ -2366,6 +2370,13 @@ <permission android:name="android.permission.BIND_GBA_SERVICE" android:protectionLevel="signature" /> + <!-- Required for an Application to access APIs related to RCS User Capability Exchange. + <p>Protection level: signature|privileged + @SystemApi + @hide --> + <permission android:name="android.permission.ACCESS_RCS_USER_CAPABILITY_EXCHANGE" + android:protectionLevel="signature|privileged" /> + <!-- ================================== --> <!-- Permissions for sdcard interaction --> <!-- ================================== --> diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index 0c63c1096a3a..47dbd64c0402 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -1560,6 +1560,13 @@ <enum name="always" value="1" /> </attr> + <attr name="memtagMode"> + <enum name="default" value="-1" /> + <enum name="off" value="0" /> + <enum name="async" value="1" /> + <enum name="sync" value="2" /> + </attr> + <!-- The <code>manifest</code> tag is the root of an <code>AndroidManifest.xml</code> file, describing the contents of an Android package (.apk) file. One @@ -1827,6 +1834,10 @@ <attr name="gwpAsanMode" /> + <attr name="memtagMode" /> + + <attr name="nativeHeapZeroInit" format="boolean" /> + <!-- @hide no longer used, kept to preserve padding --> <attr name="allowAutoRevokePermissionsExemption" format="boolean" /> @@ -2350,6 +2361,8 @@ <!-- Required name of the process that is allowed --> <attr name="process" /> <attr name="gwpAsanMode" /> + <attr name="memtagMode" /> + <attr name="nativeHeapZeroInit" /> </declare-styleable> <!-- The <code>deny-permission</code> tag specifies that a permission is to be denied diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index b2ceed402ca1..22a79ed12c24 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -4414,4 +4414,7 @@ <!-- Whether to select voice/data/sms preference without user confirmation --> <bool name="config_voice_data_sms_auto_fallback">false</bool> + + <!-- Whether to allow the caching of the SIM PIN for verification after unattended reboot --> + <bool name="config_allow_pin_storage_for_unattended_reboot">true</bool> </resources> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 0874a77815b5..0f846d3dbad9 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -3046,6 +3046,8 @@ <public name="canPauseRecording" /> <!-- attribute definitions go here --> <public name="requireDeviceScreenOn" /> + <public name="memtagMode" /> + <public name="nativeHeapZeroInit" /> </public-group> <public-group type="drawable" first-id="0x010800b5"> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 4509b4e0b3f9..fc75463a44fa 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2612,6 +2612,7 @@ <java-symbol type="bool" name="config_defaultWindowFeatureContextMenu" /> <java-symbol type="bool" name="config_overrideRemoteViewsActivityTransition" /> <java-symbol type="attr" name="colorProgressBackgroundNormal" /> + <java-symbol type="bool" name="config_allow_pin_storage_for_unattended_reboot" /> <java-symbol type="layout" name="simple_account_item" /> <java-symbol type="string" name="prohibit_manual_network_selection_in_gobal_mode" /> |