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

Commit e4ad2e51 authored by James Mattis's avatar James Mattis Committed by Gerrit Code Review
Browse files

Merge "Adding permission for Ethernet Network Management"

parents f4a4508e e8308b2d

core/api/system-current.txt

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

    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_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_HOTWORD_DETECTION = "android.permission.MANAGE_HOTWORD_DETECTION";

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

core/res/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -1945,6 +1945,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 EthernetNetworkUpdateRequest 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,