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

Commit ec6942ae authored by Raphael Kim's avatar Raphael Kim Committed by Automerger Merge Worker
Browse files

Merge "Add USE_ATTESTATION_VERIFICATION_SERVICE permission to shell for GTS... 

Merge "Add USE_ATTESTATION_VERIFICATION_SERVICE permission to shell for GTS test" into udc-dev am: 30d70c98 am: b83632d3 am: 0cbc1d67

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



Change-Id: I7050a6d4e4dac6b2e0690472b89900cc2f2cf90f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 362d7988 0cbc1d67

data/etc/privapp-permissions-platform.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -520,6 +520,8 @@ applications that come with the platform 
        <permission name="android.permission.SOUND_TRIGGER_RUN_IN_BATTERY_SAVER"/>

        <permission name="android.permission.SOUND_TRIGGER_RUN_IN_BATTERY_SAVER"/>

        <!-- Permission required for CTS test - SatelliteManagerTest -->

        <!-- Permission required for CTS test - SatelliteManagerTest -->

        <permission name="android.permission.SATELLITE_COMMUNICATION"/>

        <permission name="android.permission.SATELLITE_COMMUNICATION"/>

        <!-- Permission required for GTS test - GtsAttestationVerificationDeviceSideTestCases -->

        <permission name="android.permission.USE_ATTESTATION_VERIFICATION_SERVICE" />

    </privapp-permissions>

    </privapp-permissions>





    <privapp-permissions package="com.android.statementservice">

    <privapp-permissions package="com.android.statementservice">

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -834,6 +834,9 @@ 




    <uses-permission android:name="android.permission.LOG_FOREGROUND_RESOURCE_USE"/>

    <uses-permission android:name="android.permission.LOG_FOREGROUND_RESOURCE_USE"/>





    <!-- Permission required for GTS test - GtsAttestationVerificationDeviceSideTestCases -->

    <uses-permission android:name="android.permission.USE_ATTESTATION_VERIFICATION_SERVICE" />



    <application android:label="@string/app_label"

    <application android:label="@string/app_label"

                android:theme="@android:style/Theme.DeviceDefault.DayNight"

                android:theme="@android:style/Theme.DeviceDefault.DayNight"

                android:defaultToDeviceProtectedStorage="true"

                android:defaultToDeviceProtectedStorage="true"