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

Commit 7e909308 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Unify permissions under UPDATE_DEVICE_STATS."

parents 9f02a4ee 9f09e6a7

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ package android { 
    field public static final java.lang.String MODIFY_AUDIO_SETTINGS = "android.permission.MODIFY_AUDIO_SETTINGS";

    field public static final java.lang.String MODIFY_CELL_BROADCASTS = "android.permission.MODIFY_CELL_BROADCASTS";

    field public static final java.lang.String MODIFY_DAY_NIGHT_MODE = "android.permission.MODIFY_DAY_NIGHT_MODE";

    field public static final java.lang.String MODIFY_NETWORK_ACCOUNTING = "android.permission.MODIFY_NETWORK_ACCOUNTING";

    field public static final deprecated java.lang.String MODIFY_NETWORK_ACCOUNTING = "android.permission.MODIFY_NETWORK_ACCOUNTING";

    field public static final java.lang.String MODIFY_PARENTAL_CONTROLS = "android.permission.MODIFY_PARENTAL_CONTROLS";

    field public static final java.lang.String MODIFY_PHONE_STATE = "android.permission.MODIFY_PHONE_STATE";

    field public static final java.lang.String MOUNT_FORMAT_FILESYSTEMS = "android.permission.MOUNT_FORMAT_FILESYSTEMS";

core/res/AndroidManifest.xml

+1 −3
Original line number Diff line number Diff line
@@ -3162,9 +3162,7 @@ 
    <permission android:name="android.permission.MANAGE_FALLBACK_SUBSCRIPTION_PLANS"

        android:protectionLevel="signature|privileged" />



    <!-- @SystemApi Allows an application to account its network traffic against other UIDs. Used

         by system services like download manager and media server. Not for use by

         third party apps. @hide -->

    <!-- @SystemApi @hide @deprecated use UPDATE_DEVICE_STATS instead -->

    <permission android:name="android.permission.MODIFY_NETWORK_ACCOUNTING"

        android:protectionLevel="signature|privileged" />

core/tests/utiltests/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 


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

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

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

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

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

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

data/etc/platform.xml

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 
    </permission>



    <!-- Group that can modify how network statistics are accounted -->

    <permission name="android.permission.MODIFY_NETWORK_ACCOUNTING">

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

        <group gid="net_bw_acct" />

    </permission>

data/etc/privapp-permissions-platform.xml

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

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

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

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

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

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

    </privapp-permissions>