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

Commit e45d3ff8 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add missing RequiresPermission to EthernetManager" am: b3d7fe48 am:... 

Merge "Add missing RequiresPermission to EthernetManager" am: b3d7fe48 am: 360c24f9 am: 039c94ce am: d70c15b1

Change-Id: Ie01a896e28be9b1eca30755504ca0ea16c367e5f
parents 700272c0 d70c15b1

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