Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f34000a6 authored by WAYNE YANG's avatar WAYNE YANG Committed by Automerger Merge Worker
Browse files

Merge "Adds the knownSigner protection level to the permission of the demo... 

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

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



Change-Id: I17d14ae2cade1c9b199c42a0123fe4d38207c873
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 85ff2df8 c6e377fb

core/res/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -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. -->

core/res/res/values/arrays.xml

+6 −0
Original line number Diff line number Diff line
@@ -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>