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

Commit 2398e9be authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Remi NGUYEN VAN
Browse files

Add missing RequiresPermission to EthernetManager 

The method requires NETWORK_STACK or MAINLINE_NETWORK_STACK permissions,
but the annotation was missing.

Test: m
Fixes: 150877670
Merged-In: I2af74cbcfa642f05f5e7bf85b2a8e8c38595f6ca
(cherry picked from commit e45d3ff8)

Change-Id: Ia215b74df99ae60be2e380917be68a272d658ef4
parent 5580360b

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -6128,7 +6128,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 {

































api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -1727,7 +1727,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 {

































core/java/android/net/EthernetManager.java



+5
−0




























Original line number
Diff line number
Diff line








@@ -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) {