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

Merge "Adds the knownSigner protection level to the permission of the demo device provisioning." into udc-dev am: c6e377fbd7

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21573563

Change-Id: Ic4515579ca8c5a71c4538a3676f877605b339f76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
WAYNE YANG
2023-03-02 14:07:39 +00:00
committed by Automerger Merge Worker
parent 9f83622e9d c6e377fbd7
commit 8949ffc9c0
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/AndroidManifest.xml
View File

@@ -3707,7 +3707,8 @@
<!-- @SystemApi @hide Allows an application to set a device owner on retail demo devices.-->
<permission android:name="android.permission.PROVISION_DEMO_DEVICE"
android:protectionLevel="signature|setup" />
android:protectionLevel="signature|setup|knownSigner"
android:knownCerts="@array/demo_device_provisioning_known_signers" />
<!-- @TestApi @hide Allows an application to reset the record of previous system update freeze
periods. -->

6
core/res/res/values/arrays.xml
View File

@@ -227,4 +227,10 @@
<string-array name="device_state_notification_thermal_contents">
<item>@string/concurrent_display_notification_thermal_content</item>
</string-array>
<!-- Certificate digests for trusted apps that will be allowed to obtain the knownSigner of the
demo device provisioning permissions. -->
<string-array name="demo_device_provisioning_known_signers">
<item>@string/config_retailDemoPackageSignature</item>
</string-array>
</resources>