From 5f1c1105db041a58c3639f936a6ccac8f546323f Mon Sep 17 00:00:00 2001 From: lifr Date: Tue, 30 Mar 2021 21:04:53 +0800 Subject: [PATCH] Remove unnecessary public API getActiveNetworkForUid We have exposed the CS module API getActiveNetworkForUid (Used in Jobscheduler) as a temporary solution for the mainline Connectivity service module. This API usage has now been removed in Jobscheduler(b/165835257), so we can permanently remove the public getActiveNetworkForUid API. Bug: 183465229 Test: atest FrameworksNetTests Change-Id: I0f23272d2d8a5118f2e11ac325fdb9e8f9dbe0e3 --- framework/api/current.txt | 1 - framework/src/android/net/ConnectivityManager.java | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/api/current.txt b/framework/api/current.txt index 0a9560a5c5..0dbac8ccd7 100644 --- a/framework/api/current.txt +++ b/framework/api/current.txt @@ -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(); diff --git a/framework/src/android/net/ConnectivityManager.java b/framework/src/android/net/ConnectivityManager.java index 3939c7f441..3488679c7f 100644 --- a/framework/src/android/net/ConnectivityManager.java +++ b/framework/src/android/net/ConnectivityManager.java @@ -1192,7 +1192,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