Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59249653 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Make registerDefaultNetwork work on metered networks. am: b60570c7 

am: d10ea3dc

Change-Id: Ief2f4c0073f87f7a7e7f33c322365dc4e8eefdeb
parents e04e653f d10ea3dc

services/core/java/com/android/server/ConnectivityService.java

+4 −1
Original line number Diff line number Diff line
@@ -3955,8 +3955,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) {