commit 56c2391f3032dc80e391c6ece54d600c557808e8
author James Mattis <jmattis@google.com> Fri Feb 04 23:50:15 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 04 23:50:15 2022 +0000
tree 254e141c71db9b8490d4bf87252cd570e69dcdb6
parent 599b35b50493f1a9755c94eb9c6016a48153c91d
parent ef5dce218522150cc34dd6e13d5eba2fa6874048

Merge "Adding permission for Ethernet Network Management" am: eac7dc0e8d am: 010a360741 am: ef5dce2185

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964543

Change-Id: Iae77b26dda93af5685c35969d1dc3bfed0ff93e4

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

diff --git a/framework-t/src/android/net/EthernetManager.java b/framework-t/src/android/net/EthernetManager.java
index f472d56..e0ce081 100644
--- a/framework-t/src/android/net/EthernetManager.java
+++ b/framework-t/src/android/net/EthernetManager.java
@@ -358,6 +358,7 @@
         return proxy;
     }
 
+    @RequiresPermission(android.Manifest.permission.MANAGE_ETHERNET_NETWORKS)
     private void updateConfiguration(
             @NonNull String iface,
             @NonNull EthernetNetworkUpdateRequest request,
@@ -372,6 +373,7 @@
         }
     }
 
+    @RequiresPermission(android.Manifest.permission.MANAGE_ETHERNET_NETWORKS)
     private void connectNetwork(
             @NonNull String iface,
             @Nullable @CallbackExecutor Executor executor,
@@ -385,6 +387,7 @@
         }
     }
 
+    @RequiresPermission(android.Manifest.permission.MANAGE_ETHERNET_NETWORKS)
     private void disconnectNetwork(
             @NonNull String iface,
             @Nullable @CallbackExecutor Executor executor,