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

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

Merge \"Make registerDefaultNetwork work on metered networks.\" into nyc-dev 

am: 33cdc4d1

Change-Id: I0ad7b79f1af992dd556de5e17a6a1aae9c46e423
parents 7836a20c 33cdc4d1

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

+1 −1
Original line number Diff line number Diff line
@@ -3978,8 +3978,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        } else {

            networkCapabilities = new NetworkCapabilities(networkCapabilities);

            enforceNetworkRequestPermissions(networkCapabilities);

        }

            enforceMeteredApnPolicy(networkCapabilities);

        }

        ensureRequestableCapabilities(networkCapabilities);



        if (timeoutMs < 0 || timeoutMs > ConnectivityManager.MAX_NETWORK_REQUEST_TIMEOUT_MS) {