summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorChiachang Wang <chiachangwang@google.com>2020-12-15 07:02:54 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-12-15 07:02:54 +0000
commit9924f6ac8f669804b13fb5cbaa3f6fcd79a0c6cb (patch)
treea762377b9dfa56f903e42ff2703b948e594b8788 /core/java/android
parente9c000eee281e46908f557f8625cc7a6e657ce0f (diff)
parent8fd2f6d2aaa5df6807442952dab577cd54c6181a (diff)
Merge "Remove hidden deprecated getActiveNetworkQuotaInfo"
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/net/ConnectivityManager.java11
-rw-r--r--core/java/android/net/IConnectivityManager.aidl2
2 files changed, 0 insertions, 13 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index cf5d4e579f85..1e968721e637 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -2108,17 +2108,6 @@ public class ConnectivityManager {
// 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
* @deprecated Talk to TelephonyManager directly
diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl
index 41732008b4ee..fb0128363310 100644
--- a/core/java/android/net/IConnectivityManager.aidl
+++ b/core/java/android/net/IConnectivityManager.aidl
@@ -25,7 +25,6 @@ import android.net.Network;
import android.net.NetworkAgentConfig;
import android.net.NetworkCapabilities;
import android.net.NetworkInfo;
-import android.net.NetworkQuotaInfo;
import android.net.NetworkRequest;
import android.net.NetworkState;
import android.net.ISocketKeepaliveCallback;
@@ -76,7 +75,6 @@ interface IConnectivityManager
@UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
NetworkState[] getAllNetworkState();
- NetworkQuotaInfo getActiveNetworkQuotaInfo();
boolean isActiveNetworkMetered();
boolean requestRouteToHostAddress(int networkType, in byte[] hostAddress,