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

Commit ad553fb6 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Android (Google) Code Review
Browse files

Merge "Add missing RequiresPermission to EthernetManager" into rvc-dev

parents 0cb85d1a 2398e9be

api/system-current.txt

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








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