Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change resource name per GMS requirement" into udc-dev

Browse Source
This commit is contained in:
Manish Singh
2023-02-21 18:13:32 +00:00
committed by Android (Google) Code Review
parent ca9e2463e9 e84d066d57
commit fbfe358a9d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/AndroidManifest.xml
View File

@@ -7564,7 +7564,7 @@
HealthConnect can later integrate it. -->
<permission android:name="android.permission.STAGE_HEALTH_CONNECT_REMOTE_DATA"
android:protectionLevel="signature|knownSigner"
android:knownCerts="@array/config_healthConnectStagingDataKnownSigners"/>
android:knownCerts="@array/config_healthConnectRestoreKnownSigners"/>
<!-- @hide @TestApi Allows an application to clear HealthConnect's staged remote data for
testing only. For security reasons, this is a platform-only permission. -->

2
core/res/res/values/config.xml
View File

@@ -6286,7 +6286,7 @@
<!-- Certificate digests for trusted apps that will be allowed to obtain the knownSigner
permission for staging HealthConnect's remote data. The digest should be computed over the
DER encoding of the trusted certificate using the SHA-256 digest algorithm. -->
<string-array name="config_healthConnectStagingDataKnownSigners">
<string-array name="config_healthConnectRestoreKnownSigners">
</string-array>
<!-- Certificate digests for trusted apps that will be allowed to obtain the knownSigner Health
Connect Migration permissions. The digest should be computed over the DER encoding of the