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

Commit 44bdd8fb authored by James Mattis's avatar James Mattis
Browse files

Adding permission for Ethernet Network Management 

Adding MANAGE_ETHERNET_NETWORKS as a signature level permission
to allow an application to dynamically change ethernet network values.

Bug: 210485380
Test: atest EthernetServiceTests

cherry pick of aosp/1964543

Change-Id: Icf9c2accc86735cc981adc0d5a24802e0616ffaf
parent 24c7b811

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ package android { 
    field public static final String MANAGE_CONTENT_SUGGESTIONS = "android.permission.MANAGE_CONTENT_SUGGESTIONS";

    field public static final String MANAGE_DEBUGGING = "android.permission.MANAGE_DEBUGGING";

    field public static final String MANAGE_DEVICE_ADMINS = "android.permission.MANAGE_DEVICE_ADMINS";

    field public static final String MANAGE_ETHERNET_NETWORKS = "android.permission.MANAGE_ETHERNET_NETWORKS";

    field public static final String MANAGE_FACTORY_RESET_PROTECTION = "android.permission.MANAGE_FACTORY_RESET_PROTECTION";

    field public static final String MANAGE_GAME_ACTIVITY = "android.permission.MANAGE_GAME_ACTIVITY";

    field public static final String MANAGE_GAME_MODE = "android.permission.MANAGE_GAME_MODE";

core/res/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -2027,6 +2027,11 @@ 
    <permission android:name="android.permission.CONTROL_OEM_PAID_NETWORK_PREFERENCE"

        android:protectionLevel="signature" />



    <!-- @SystemApi @hide Allows an application to manage ethernet networks.

         <p>Not for use by third-party or privileged applications. -->

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

        android:protectionLevel="signature" />



    <!-- ======================================= -->

    <!-- Permissions for short range, peripheral networks -->

    <!-- ======================================= -->

packages/ConnectivityT/framework-t/src/android/net/EthernetManager.java

+3 −0
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ public class EthernetManager { 
        return proxy;

    }



    @RequiresPermission(android.Manifest.permission.MANAGE_ETHERNET_NETWORKS)

    private void updateConfiguration(

            @NonNull String iface,

            @NonNull InternalNetworkUpdateRequest request,
@@ -372,6 +373,7 @@ public class EthernetManager { 
        }

    }



    @RequiresPermission(android.Manifest.permission.MANAGE_ETHERNET_NETWORKS)

    private void connectNetwork(

            @NonNull String iface,

            @Nullable @CallbackExecutor Executor executor,
@@ -385,6 +387,7 @@ public class EthernetManager { 
        }

    }



    @RequiresPermission(android.Manifest.permission.MANAGE_ETHERNET_NETWORKS)

    private void disconnectNetwork(

            @NonNull String iface,

            @Nullable @CallbackExecutor Executor executor,