Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adding permission for Ethernet Network Management" am: e4ad2e515e

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

Change-Id: Ibcd7b1db698c1f1e4b72dbe87c5e69bbd6d8bbc0
This commit is contained in:
James Mattis
2022-02-04 23:12:47 +00:00
committed by Automerger Merge Worker
parent 9845deb4e9 e4ad2e515e
commit eaa1e819cf
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -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_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_CONTENT_SUGGESTIONS = "android.permission.MANAGE_CONTENT_SUGGESTIONS";
field public static final String MANAGE_DEBUGGING = "android.permission.MANAGE_DEBUGGING"; 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_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_HOTWORD_DETECTION = "android.permission.MANAGE_HOTWORD_DETECTION";
field public static final String MANAGE_IPSEC_TUNNELS = "android.permission.MANAGE_IPSEC_TUNNELS"; field public static final String MANAGE_IPSEC_TUNNELS = "android.permission.MANAGE_IPSEC_TUNNELS";

5
core/res/AndroidManifest.xml
View File

@@ -1945,6 +1945,11 @@
<permission android:name="android.permission.CONTROL_OEM_PAID_NETWORK_PREFERENCE" <permission android:name="android.permission.CONTROL_OEM_PAID_NETWORK_PREFERENCE"
android:protectionLevel="signature" /> 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 --> <!-- Permissions for short range, peripheral networks -->
<!-- ======================================= --> <!-- ======================================= -->

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

@@ -358,6 +358,7 @@ public class EthernetManager {
return proxy; return proxy;
} }
@RequiresPermission(android.Manifest.permission.MANAGE_ETHERNET_NETWORKS)
private void updateConfiguration( private void updateConfiguration(
@NonNull String iface, @NonNull String iface,
@NonNull EthernetNetworkUpdateRequest request, @NonNull EthernetNetworkUpdateRequest request,
@@ -372,6 +373,7 @@ public class EthernetManager {
} }
} }
@RequiresPermission(android.Manifest.permission.MANAGE_ETHERNET_NETWORKS)
private void connectNetwork( private void connectNetwork(
@NonNull String iface, @NonNull String iface,
@Nullable @CallbackExecutor Executor executor, @Nullable @CallbackExecutor Executor executor,
@@ -385,6 +387,7 @@ public class EthernetManager {
} }
} }
@RequiresPermission(android.Manifest.permission.MANAGE_ETHERNET_NETWORKS)
private void disconnectNetwork( private void disconnectNetwork(
@NonNull String iface, @NonNull String iface,
@Nullable @CallbackExecutor Executor executor, @Nullable @CallbackExecutor Executor executor,