Merge "Add ability to override subscriber capabilities."
am: d6cd4b241a Change-Id: Id035d437e9b297ba70ba9231f6cfdd44e5b9c257
This commit is contained in:
@@ -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) {
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user