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

Commit ab638c1e authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Expose registerDefaultNetworkCallbackAsUid. 

Bug: 165835257
Test: atest FrameworksNetTests
Change-Id: I638ed5cd5273d456919630aba1e22f099df1b36c
parent a3d14561

packages/Connectivity/framework/api/module-lib-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ package android.net { 
    method @Nullable public android.net.ProxyInfo getGlobalProxy();

    method @NonNull public static android.util.Range<java.lang.Integer> getIpSecNetIdRange();

    method @NonNull public static String getPrivateDnsMode(@NonNull android.content.Context);

    method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public void registerDefaultNetworkCallbackAsUid(int, @NonNull android.net.ConnectivityManager.NetworkCallback, @NonNull android.os.Handler);

    method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public void registerSystemDefaultNetworkCallback(@NonNull android.net.ConnectivityManager.NetworkCallback, @NonNull android.os.Handler);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void requestBackgroundNetwork(@NonNull android.net.NetworkRequest, @NonNull android.os.Handler, @NonNull android.net.ConnectivityManager.NetworkCallback);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void setAcceptPartialConnectivity(@NonNull android.net.Network, boolean, boolean);

packages/Connectivity/framework/src/android/net/ConnectivityManager.java

+1 −1
Original line number Diff line number Diff line
@@ -4252,7 +4252,7 @@ public class ConnectivityManager { 
     * @throws RuntimeException if the app already has too many callbacks registered.

     * @hide

     */

    // TODO: @SystemApi(client=MODULE_LIBRARIES)

    @SystemApi(client = MODULE_LIBRARIES)

    @SuppressLint({"ExecutorRegistration", "PairedRegistration"})

    @RequiresPermission(anyOf = {

            NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK,