Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add ability to override subscriber capabilities."

Browse Source 
am: d6cd4b241a

Change-Id: Id035d437e9b297ba70ba9231f6cfdd44e5b9c257
This commit is contained in:
Jeff Sharkey
2018-01-19 01:04:32 +00:00
committed by android-build-merger
parent e7aaba48de d6cd4b241a
commit 5e097d452b
5 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/net/INetworkPolicyListener.aidl
View File

@@ -18,10 +18,9 @@ package android.net;
/** {@hide} */
oneway interface INetworkPolicyListener {
void onUidRulesChanged(int uid, int uidRules);
void onMeteredIfacesChanged(in String[] meteredIfaces);
void onRestrictBackgroundChanged(boolean restrictBackground);
void onUidPoliciesChanged(int uid, int uidPolicies);
void onSubscriptionOverride(int subId, int overrideMask, int overrideValue);
}

12
core/java/android/net/NetworkPolicyManager.java
View File

@@ -114,6 +114,9 @@ public class NetworkPolicyManager {
*/
public static final String EXTRA_NETWORK_TEMPLATE = "android.net.NETWORK_TEMPLATE";
public static final int OVERRIDE_UNMETERED = 1 << 0;
public static final int OVERRIDE_CONGESTED = 1 << 1;
private final Context mContext;
private INetworkPolicyManager mService;
@@ -348,4 +351,13 @@ public class NetworkPolicyManager {
public static String resolveNetworkId(String ssid) {
return WifiInfo.removeDoubleQuotes(ssid);
}
/** {@hide} */
public static class Listener extends INetworkPolicyListener.Stub {
@Override public void onUidRulesChanged(int uid, int uidRules) { }
@Override public void onMeteredIfacesChanged(String[] meteredIfaces) { }
@Override public void onRestrictBackgroundChanged(boolean restrictBackground) { }
@Override public void onUidPoliciesChanged(int uid, int uidPolicies) { }
@Override public void onSubscriptionOverride(int subId, int overrideMask, int overrideValue) { }
}
}

16
packages/SystemUI/src/com/android/systemui/statusbar/policy/DataSaverControllerImpl.java
View File

@@ -74,17 +74,9 @@ public class DataSaverControllerImpl implements DataSaverController {
}
}
private final INetworkPolicyListener mPolicyListener = new INetworkPolicyListener.Stub() {
private final INetworkPolicyListener mPolicyListener = new NetworkPolicyManager.Listener() {
@Override
public void onUidRulesChanged(int uid, int uidRules) throws RemoteException {
}
@Override
public void onMeteredIfacesChanged(String[] strings) throws RemoteException {
}
@Override
public void onRestrictBackgroundChanged(final boolean isDataSaving) throws RemoteException {
public void onRestrictBackgroundChanged(final boolean isDataSaving) {
mHandler.post(new Runnable() {
@Override
public void run() {
@@ -92,10 +84,6 @@ public class DataSaverControllerImpl implements DataSaverController {
}
});
}
@Override
public void onUidPoliciesChanged(int uid, int uidPolicies) throws RemoteException {
}
};
}

9
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -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) {
}
};
/**

7
services/core/java/com/android/server/job/controllers/ConnectivityController.java
View File

@@ -201,7 +201,7 @@ public final class ConnectivityController extends StateController implements
}
};
private final INetworkPolicyListener mNetPolicyListener = new INetworkPolicyListener.Stub() {
private final INetworkPolicyListener mNetPolicyListener = new NetworkPolicyManager.Listener() {
@Override
public void onUidRulesChanged(int uid, int uidRules) {
if (DEBUG) {
@@ -210,11 +210,6 @@ public final class ConnectivityController extends StateController implements
updateTrackedJobs(uid);
}
@Override
public void onMeteredIfacesChanged(String[] meteredIfaces) {
// We track this via our NetworkCallback
}
@Override
public void onRestrictBackgroundChanged(boolean restrictBackground) {
if (DEBUG) {