Make registerDefaultNetwork work on metered networks.
Bug: 29927488 Change-Id: I3b705c2ab0d1493546ffa5185bb5b07d5e25c897
This commit is contained in:
@@ -3952,8 +3952,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
|
|||||||
} else {
|
} else {
|
||||||
networkCapabilities = new NetworkCapabilities(networkCapabilities);
|
networkCapabilities = new NetworkCapabilities(networkCapabilities);
|
||||||
enforceNetworkRequestPermissions(networkCapabilities);
|
enforceNetworkRequestPermissions(networkCapabilities);
|
||||||
|
// TODO: this is incorrect. We mark the request as metered or not depending on the state
|
||||||
|
// of the app when the request is filed, but we never change the request if the app
|
||||||
|
// changes network state. http://b/29964605
|
||||||
|
enforceMeteredApnPolicy(networkCapabilities);
|
||||||
}
|
}
|
||||||
enforceMeteredApnPolicy(networkCapabilities);
|
|
||||||
ensureRequestableCapabilities(networkCapabilities);
|
ensureRequestableCapabilities(networkCapabilities);
|
||||||
|
|
||||||
if (timeoutMs < 0 || timeoutMs > ConnectivityManager.MAX_NETWORK_REQUEST_TIMEOUT_MS) {
|
if (timeoutMs < 0 || timeoutMs > ConnectivityManager.MAX_NETWORK_REQUEST_TIMEOUT_MS) {
|
||||||
|
|||||||
Reference in New Issue
Block a user