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

Commit 3a84e2fa authored by Motomu Utsumi's avatar Motomu Utsumi Committed by Android (Google) Code Review
Browse files

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

parents 365f625e 5c6ba1f2

core/java/android/net/flags.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -70,14 +70,6 @@ flag { 
    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"

}



flag {

  name: "create_app_specific_network_permission"

  namespace: "android_core_networking"

core/res/AndroidManifest.xml

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














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















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













                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" />













                android:protectionLevel="signature|role" />





























    <!-- @SystemApi @hide Allows applications to register a NetworkAgent for its own use.















         <p>Such networks are not available to other applications on the device unless they have

































data/etc/com.android.systemui.xml



+0
−1




























Original line number
Diff line number
Diff line








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













        <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



+0
−4




























Original line number
Diff line number
Diff line








@@ -725,8 +725,4 @@ 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>