Remove hidden deprecated getActiveNetworkQuotaInfo

getActiveNetworkQuotaInfo has never been in API surface since it
was introduced. It became essentially functionless since android O,
so there should be no usage dependency upon the hidden method,
In order to support ConnectivityService mainline, remove the
useless function to prevent necessary dependency.

Bug: 172183305
Test: atest FrameworksNetTests
Change-Id: Ia685b3260256d465ef614b2f577d13344074c787
This commit is contained in:
Chiachang Wang
2020-12-14 11:06:02 +08:00
parent 081753f277
commit 2f81e75ae4
3 changed files with 0 additions and 22 deletions

View File

@@ -2108,17 +2108,6 @@ public class ConnectivityManager {
// ignored // ignored
} }
/** {@hide} */
@Deprecated
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
public NetworkQuotaInfo getActiveNetworkQuotaInfo() {
try {
return mService.getActiveNetworkQuotaInfo();
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
/** /**
* @hide * @hide
* @deprecated Talk to TelephonyManager directly * @deprecated Talk to TelephonyManager directly

View File

@@ -25,7 +25,6 @@ import android.net.Network;
import android.net.NetworkAgentConfig; import android.net.NetworkAgentConfig;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.net.NetworkQuotaInfo;
import android.net.NetworkRequest; import android.net.NetworkRequest;
import android.net.NetworkState; import android.net.NetworkState;
import android.net.ISocketKeepaliveCallback; import android.net.ISocketKeepaliveCallback;
@@ -76,7 +75,6 @@ interface IConnectivityManager
@UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
NetworkState[] getAllNetworkState(); NetworkState[] getAllNetworkState();
NetworkQuotaInfo getActiveNetworkQuotaInfo();
boolean isActiveNetworkMetered(); boolean isActiveNetworkMetered();
boolean requestRouteToHostAddress(int networkType, in byte[] hostAddress, boolean requestRouteToHostAddress(int networkType, in byte[] hostAddress,

View File

@@ -113,7 +113,6 @@ import android.net.NetworkInfo.DetailedState;
import android.net.NetworkMonitorManager; import android.net.NetworkMonitorManager;
import android.net.NetworkPolicyManager; import android.net.NetworkPolicyManager;
import android.net.NetworkProvider; import android.net.NetworkProvider;
import android.net.NetworkQuotaInfo;
import android.net.NetworkRequest; import android.net.NetworkRequest;
import android.net.NetworkSpecifier; import android.net.NetworkSpecifier;
import android.net.NetworkStack; import android.net.NetworkStack;
@@ -1779,14 +1778,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
return result.toArray(new NetworkState[result.size()]); return result.toArray(new NetworkState[result.size()]);
} }
@Override
@Deprecated
public NetworkQuotaInfo getActiveNetworkQuotaInfo() {
Log.w(TAG, "Shame on UID " + Binder.getCallingUid()
+ " for calling the hidden API getNetworkQuotaInfo(). Shame!");
return new NetworkQuotaInfo();
}
@Override @Override
public boolean isActiveNetworkMetered() { public boolean isActiveNetworkMetered() {
enforceAccessPermission(); enforceAccessPermission();