commit ef5dce218522150cc34dd6e13d5eba2fa6874048
author James Mattis <jmattis@google.com> Fri Feb 04 23:29:35 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 04 23:29:35 2022 +0000
tree 254e141c71db9b8490d4bf87252cd570e69dcdb6
parent 00a4143745d7f0be295fe2b6c5ce195bc2e9b6b1
parent 010a360741217111e3e7e251ea416f055074517b

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

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

Change-Id: Ic3064d02915c9de66f98c7b3e76641367cbd5080

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,