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

Commit 03c81cdc authored by Roshan Pius's avatar Roshan Pius Committed by Gerrit Code Review
Browse files

Merge "shell(nfc): Add NFC_SET_CONTROLLER_ALWAYS_ON for NFC testing" into main

parents 45fbeacb 0d177c96

data/etc/privapp-permissions-platform.xml

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

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

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

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

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

    </privapp-permissions>



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

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -932,6 +932,9 @@ 
    <uses-permission

        android:name="android.permission.OVERRIDE_SYSTEM_KEY_BEHAVIOR_IN_FOCUSED_WINDOW" />



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

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



    <application

        android:label="@string/app_label"

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