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

Commit e6565f57 authored by Ken Chen's avatar Ken Chen
Browse files

resolve merge conflicts of a3e32c8b to sc-dev 

Bug: 185071689
Change-Id: I1524a534590361a585469ddf959e582484493e4e
parents 01f110bf a3e32c8b

data/etc/privapp-permissions-platform.xml

+1 −1
Original line number Diff line number Diff line
@@ -519,7 +519,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" />