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

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

Merge "resolve merge conflicts of a3e32c8b to... 

Merge "resolve merge conflicts of a3e32c8b to sc-dev" into sc-dev am: 81b5c878

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

Change-Id: I44afe26077a4200de37e1440effea315cefb43b0
parents b554e14d 81b5c878

data/etc/privapp-permissions-platform.xml

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ applications that come with the platform 
        <permission name="android.permission.CONFIGURE_DISPLAY_BRIGHTNESS" />

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

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

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

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

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

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

    </privapp-permissions>

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -414,6 +414,9 @@ 
    <!-- Permission required for testing system audio effect APIs. -->

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



    <!-- Permission required for running networking unit tests -->

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



    <!-- Permissions required for CTS test - TunerTest -->

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

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