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

Commit 31395c10 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Grant permission to shell for ResourceObserverNativeTest" into sc-dev am: c8593c87 

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

Change-Id: I303b101d12ec4649cd9e1304f7ee2b82eeb465d2
parents c4bf1857 c8593c87

data/etc/privapp-permissions-platform.xml

+2 −0
Original line number Diff line number Diff line
@@ -495,6 +495,8 @@ applications that come with the platform 
        <!-- Permission required for hotword detection service CTS tests -->

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

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

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

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

    </privapp-permissions>



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

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -435,6 +435,9 @@ 


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



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

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



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

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

                android:defaultToDeviceProtectedStorage="true"