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

Commit 71bfd91d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove unnecessary public API getActiveNetworkForUid" into sc-dev

parents cebea4ce 69ff9653

packages/Connectivity/framework/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ package android.net { 
    method public boolean bindProcessToNetwork(@Nullable android.net.Network);

    method @NonNull public android.net.SocketKeepalive createSocketKeepalive(@NonNull android.net.Network, @NonNull android.net.IpSecManager.UdpEncapsulationSocket, @NonNull java.net.InetAddress, @NonNull java.net.InetAddress, @NonNull java.util.concurrent.Executor, @NonNull android.net.SocketKeepalive.Callback);

    method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE) public android.net.Network getActiveNetwork();

    method @Nullable @RequiresPermission(android.Manifest.permission.NETWORK_STACK) public android.net.Network getActiveNetworkForUid(int);

    method @Deprecated @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE) public android.net.NetworkInfo getActiveNetworkInfo();

    method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE) public android.net.NetworkInfo[] getAllNetworkInfo();

    method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE) public android.net.Network[] getAllNetworks();

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

+2 −1
Original line number Diff line number Diff line
@@ -1193,7 +1193,8 @@ public class ConnectivityManager { 
     *

     * @return a {@link Network} object for the current default network for the

     *         given UID or {@code null} if no default network is currently active

     * TODO: b/183465229 Cleanup getActiveNetworkForUid once b/165835257 is fixed

     *

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.NETWORK_STACK)

    @Nullable