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

Commit 33cdc4d1 authored by Pankaj Kanwar's avatar Pankaj Kanwar Committed by Android (Google) Code Review
Browse files

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

parents 4c78b8e5 09e37156

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

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

        } else {

            networkCapabilities = new NetworkCapabilities(networkCapabilities);

            networkCapabilities = new NetworkCapabilities(networkCapabilities);

            enforceNetworkRequestPermissions(networkCapabilities);

            enforceNetworkRequestPermissions(networkCapabilities);

        }

            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) {