Merge "Add ability to override subscriber capabilities." am: d6cd4b241a

am: d358b0d1ea

Change-Id: Ib22d57c7cde75560cfd5bdd71b75d29b1056f783
This commit is contained in:
Jeff Sharkey
2018-01-19 01:11:41 +00:00
committed by android-build-merger

View File

@@ -63,6 +63,7 @@ import android.net.NetworkConfig;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.net.NetworkInfo.DetailedState; import android.net.NetworkInfo.DetailedState;
import android.net.NetworkMisc; import android.net.NetworkMisc;
import android.net.NetworkPolicyManager;
import android.net.NetworkQuotaInfo; import android.net.NetworkQuotaInfo;
import android.net.NetworkRequest; import android.net.NetworkRequest;
import android.net.NetworkSpecifier; import android.net.NetworkSpecifier;
@@ -1478,15 +1479,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
return true; return true;
} }
private final INetworkPolicyListener mPolicyListener = new INetworkPolicyListener.Stub() { private final INetworkPolicyListener mPolicyListener = new NetworkPolicyManager.Listener() {
@Override @Override
public void onUidRulesChanged(int uid, int uidRules) { public void onUidRulesChanged(int uid, int uidRules) {
// TODO: notify UID when it has requested targeted updates // TODO: notify UID when it has requested targeted updates
} }
@Override @Override
public void onMeteredIfacesChanged(String[] meteredIfaces) {
}
@Override
public void onRestrictBackgroundChanged(boolean restrictBackground) { public void onRestrictBackgroundChanged(boolean restrictBackground) {
// TODO: relocate this specific callback in Tethering. // TODO: relocate this specific callback in Tethering.
if (restrictBackground) { if (restrictBackground) {
@@ -1494,9 +1492,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
mTethering.untetherAll(); mTethering.untetherAll();
} }
} }
@Override
public void onUidPoliciesChanged(int uid, int uidPolicies) {
}
}; };
/** /**