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

Commit 180ed3d2 authored by Jerry Shi's avatar Jerry Shi Committed by Guangjie (Jerry) Shi
Browse files

Add android.permission.LAUNCH_CREDENTIAL_SELECTOR which is needed for GtsCredentialsTestCases 

Bug: 277637274
Test: atest GtsCredentialsTestCases
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:07211d002288eafb9689298570282c51c9c7631c)

cherrypick to resolve merging conflict

Change-Id: I2b805541a998160313724d24ac1ba9a826fd1d25
parent 8508595d

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

+63 −57
Original line number Diff line number Diff line
@@ -840,7 +840,11 @@ 
    <!-- Permission required for GTS test - GtsAttestationVerificationDeviceSideTestCases -->

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



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

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

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



    <application

        android:label="@string/app_label"

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

        android:defaultToDeviceProtectedStorage="true"

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

        </provider>



        <provider android:name=".HeapDumpProvider"

        <provider

            android:name=".HeapDumpProvider"

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

            android:grantUriPermissions="true"

            android:exported="false" />
@@ -878,7 +883,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"