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

Commit 7e3864bc authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge changes from topics "nw-scan-cts", "nw-scan-changes" 

am: f276a562

Change-Id: I1399e0bd8a6ff26e8df2bfc7d4515e4dbb1d64e4
parents 87217889 f276a562

data/etc/privapp-permissions-platform.xml

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

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

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

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

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

        <!-- Needed for test only -->

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

packages/Shell/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ 
    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />

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

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

    <!-- Shell only holds android.permission.NETWORK_SCAN in order to to enable CTS testing -->

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

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

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

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