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

Commit ecd85b10 authored by Nandita Viswanath's avatar Nandita Viswanath Committed by Android (Google) Code Review
Browse files

Merge "Make the 'NETWORK_FACTORY' permission privileged" into main

parents 59e2c8d7 6f9506ce

core/java/android/net/flags.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -69,3 +69,11 @@ flag { 
    description: "This flag controls VPN metrics collection."

    bug: "306313287"

}



flag {

  name: "update_network_factory_protection_level"

  is_exported: false

  namespace: "android_core_networking"

  description: "Flag for change to NETWORK_FACTORY permission to include priviliged"

  bug: "431500580"

}

core/res/AndroidManifest.xml

+6 −1
Original line number Diff line number Diff line
@@ -2334,7 +2334,12 @@ 














    <!-- @SystemApi @hide Allows applications to register network factory or agent -->















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













                android:protectionLevel="signature|role" />













                android:protectionLevel="signature|role"













                android:featureFlag="!android.net.platform.flags.update_network_factory_protection_level"/>













    <!-- @SystemApi @hide Allows applications to register network factory or agent -->













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













                android:protectionLevel="signature|privileged|role"













                android:featureFlag="android.net.platform.flags.update_network_factory_protection_level" />





























    <!-- @SystemApi @hide Allows applications to access network stats provider -->















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

































data/etc/com.android.systemui.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -98,5 +98,6 @@













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















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















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













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















    </privapp-permissions>















</permissions>
























data/etc/privapp-permissions-platform.xml



+4
−0




























Original line number
Diff line number
Diff line








@@ -722,4 +722,8 @@ applications that come with the platform













    <privapp-permissions package="com.android.wm.shell">















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















    </privapp-permissions>



























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













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













    </privapp-permissions>















</permissions>