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

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

Merge "Make pull atom permission accessible to shell" into rvc-dev am:... 

Merge "Make pull atom permission accessible to shell" into rvc-dev am: 0e4f868b am: ae21f6f5 am: 0a056190

Change-Id: I6e6d606a7b2d9dc99597e3c906ffedafe20bf5f8
parents 2ebd9284 0a056190

data/etc/privapp-permissions-platform.xml

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

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

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

        <!-- Permission required for testing registering pull atom callbacks. -->

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

    </privapp-permissions>



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

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -273,6 +273,9 @@ 
    <!-- Permission needed to read wifi network credentials for CtsNetTestCases -->

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



    <!-- Permission needed to test registering pull atom callbacks -->

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



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

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

                android:defaultToDeviceProtectedStorage="true"