From 0f2738ecb0b98a31980532a0260879172d7233ac Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Thu, 18 Jan 2018 22:01:59 +0900 Subject: [PATCH] Add ability to override subscriber capabilities. In a future set of CLs, NPMS will offer to override a handful of capabilities on a per-subId basis. Define a no-op version of the interface to make it easier to add new methods in the future. Test: bit FrameworksNetTests:android.net.,com.android.server.net. Test: bit FrameworksTelephonyTests:com.android.internal.telephony.dataconnection.DataConnectionTest Bug: 64133169 Change-Id: I03dfd98463861f0338c4174e8d8a88c300ea5b55 --- .../java/com/android/server/ConnectivityService.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 56d7e7b930..10f82934d7 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -63,6 +63,7 @@ import android.net.NetworkConfig; import android.net.NetworkInfo; import android.net.NetworkInfo.DetailedState; import android.net.NetworkMisc; +import android.net.NetworkPolicyManager; import android.net.NetworkQuotaInfo; import android.net.NetworkRequest; import android.net.NetworkSpecifier; @@ -1478,15 +1479,12 @@ public class ConnectivityService extends IConnectivityManager.Stub return true; } - private final INetworkPolicyListener mPolicyListener = new INetworkPolicyListener.Stub() { + private final INetworkPolicyListener mPolicyListener = new NetworkPolicyManager.Listener() { @Override public void onUidRulesChanged(int uid, int uidRules) { // TODO: notify UID when it has requested targeted updates } @Override - public void onMeteredIfacesChanged(String[] meteredIfaces) { - } - @Override public void onRestrictBackgroundChanged(boolean restrictBackground) { // TODO: relocate this specific callback in Tethering. if (restrictBackground) { @@ -1494,9 +1492,6 @@ public class ConnectivityService extends IConnectivityManager.Stub mTethering.untetherAll(); } } - @Override - public void onUidPoliciesChanged(int uid, int uidPolicies) { - } }; /**