Make registerDefaultNetwork work on metered networks.

am: 5c1bf510fb

Change-Id: I2d5edc273df22e5c787f227820c1ce956adfe42c
This commit is contained in:
Lorenzo Colitti
2016-07-04 16:06:51 +00:00
committed by android-build-merger

View File

@@ -3952,8 +3952,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
} else {
networkCapabilities = new NetworkCapabilities(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);
}
ensureRequestableCapabilities(networkCapabilities);
if (timeoutMs < 0 || timeoutMs > ConnectivityManager.MAX_NETWORK_REQUEST_TIMEOUT_MS) {