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

Commit 48256c0e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add android.permission.LAUNCH_CREDENTIAL_SELECTOR which is needed for... 

Merge "Add  android.permission.LAUNCH_CREDENTIAL_SELECTOR which is needed for GtsCredentialsTestCases" into udc-dev am: e28675e2

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



Change-Id: I0193eb3120adc3559a1795a75d3ee0daf1494e04
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9b07ebca e28675e2

data/etc/privapp-permissions-platform.xml

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

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

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

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

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

    </privapp-permissions>



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

packages/Shell/AndroidManifest.xml

+68 −64
Original line number Diff line number Diff line
@@ -833,11 +833,13 @@ 
    <uses-permission android:name="android.permission.WRITE_APN_SETTINGS" />



    <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" />

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

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



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

    <application

        android:label="@string/app_label"

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

        android:defaultToDeviceProtectedStorage="true"

        android:directBootAware="true">
@@ -863,7 +865,8 @@ 
            </intent-filter>

        </provider>



        <provider android:name=".HeapDumpProvider"

        <provider

            android:name=".HeapDumpProvider"

            android:authorities="com.android.shell.heapdump"

            android:grantUriPermissions="true"

            android:exported="false" />
@@ -875,7 +878,8 @@ 
            android:excludeFromRecents="true"

            android:exported="false" />



        <activity android:name=".HeapDumpActivity"

        <activity

            android:name=".HeapDumpActivity"

            android:theme="@*android:style/Theme.Translucent.NoTitleBar"

            android:label="@*android:string/dump_heap_title"

            android:finishOnCloseSystemDialogs="true"