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

Commit a1eb5c66 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into... 

Merge "Add COMPANION_APPROVE_WIFI_CONNECTIONS to shell permissions" into rvc-dev am: 5dbabb62 am: 5cd20c9e am: a8624ea2 am: b4aba3db

Change-Id: Ief4086a4e0f27c7838439882dce6ef0167e41c34
parents e35a0a91 b4aba3db

data/etc/privapp-permissions-platform.xml

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

        <!-- Permission required for UsageStatsTest CTS test. -->

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

        <!-- Permission required for CompanionDeviceManager CTS test. -->

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

    </privapp-permissions>



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

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -192,7 +192,10 @@ 
    <uses-permission android:name="android.permission.READ_CLIPBOARD_IN_BACKGROUND" />

    <!-- Permission needed to wipe the device for Test Harness Mode -->

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



    <!-- Permissions required to test CompanionDeviceManager teses in CTS -->

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

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



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