From bb5104fa138fdbf4554a14e875833759cd4d18da Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Mon, 9 Mar 2020 13:56:18 +0900 Subject: [PATCH] Add missing RequiresPermission to EthernetManager The method requires NETWORK_STACK or MAINLINE_NETWORK_STACK permissions, but the annotation was missing. Test: m Fixes: 150877670 Change-Id: I2af74cbcfa642f05f5e7bf85b2a8e8c38595f6ca --- api/system-current.txt | 2 +- api/test-current.txt | 2 +- core/java/android/net/EthernetManager.java | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index fc3eaa0448f89..19208e889c99a 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4460,7 +4460,7 @@ package android.net { } public class EthernetManager { - method @NonNull public android.net.EthernetManager.TetheredInterfaceRequest requestTetheredInterface(@NonNull java.util.concurrent.Executor, @NonNull android.net.EthernetManager.TetheredInterfaceCallback); + method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public android.net.EthernetManager.TetheredInterfaceRequest requestTetheredInterface(@NonNull java.util.concurrent.Executor, @NonNull android.net.EthernetManager.TetheredInterfaceCallback); } public static interface EthernetManager.TetheredInterfaceCallback { diff --git a/api/test-current.txt b/api/test-current.txt index c2553ed35ef70..816b139b0c612 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -1440,7 +1440,7 @@ package android.net { } public class EthernetManager { - method @NonNull public android.net.EthernetManager.TetheredInterfaceRequest requestTetheredInterface(@NonNull java.util.concurrent.Executor, @NonNull android.net.EthernetManager.TetheredInterfaceCallback); + method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public android.net.EthernetManager.TetheredInterfaceRequest requestTetheredInterface(@NonNull java.util.concurrent.Executor, @NonNull android.net.EthernetManager.TetheredInterfaceCallback); } public static interface EthernetManager.TetheredInterfaceCallback { diff --git a/core/java/android/net/EthernetManager.java b/core/java/android/net/EthernetManager.java index 139f5bebcd899..83b5f63576f28 100644 --- a/core/java/android/net/EthernetManager.java +++ b/core/java/android/net/EthernetManager.java @@ -17,6 +17,7 @@ package android.net; import android.annotation.NonNull; +import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.annotation.SystemService; import android.annotation.TestApi; @@ -248,6 +249,10 @@ public class EthernetManager { * interface, the existing interface will be used. * @param callback A callback to be called once the request has been fulfilled. */ + @RequiresPermission(anyOf = { + android.Manifest.permission.NETWORK_STACK, + android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK + }) @NonNull public TetheredInterfaceRequest requestTetheredInterface(@NonNull final Executor executor, @NonNull final TetheredInterfaceCallback callback) {