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

Commit a1540899 authored by Felipe Leme's avatar Felipe Leme
Browse files

resolve merge conflicts of fa2715e0 to nyc-mr1-dev 

Change-Id: If0a1e7e70aa33e99f05694a37c2a54c567449507
parents 580f2e15 fa2715e0

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

+8 −4
Original line number Original line Diff line number Diff line
@@ -30,8 +30,6 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED; 
import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;

import static android.net.NetworkPolicyManager.RULE_ALLOW_ALL;

import static android.net.NetworkPolicyManager.RULE_ALLOW_ALL;

import static android.net.NetworkPolicyManager.RULE_ALLOW_METERED;

import static android.net.NetworkPolicyManager.RULE_ALLOW_METERED;

import static android.net.NetworkPolicyManager.MASK_METERED_NETWORKS;

import static android.net.NetworkPolicyManager.MASK_ALL_NETWORKS;

import static android.net.NetworkPolicyManager.RULE_NONE;

import static android.net.NetworkPolicyManager.RULE_NONE;

import static android.net.NetworkPolicyManager.RULE_REJECT_ALL;

import static android.net.NetworkPolicyManager.RULE_REJECT_ALL;

import static android.net.NetworkPolicyManager.RULE_REJECT_METERED;

import static android.net.NetworkPolicyManager.RULE_REJECT_METERED;
@@ -932,7 +930,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        // Networks aren't blocked when ignoring blocked status

        // Networks aren't blocked when ignoring blocked status

        if (ignoreBlocked) return false;

        if (ignoreBlocked) return false;

        // Networks are never blocked for system services

        // Networks are never blocked for system services

        if (uid < Process.FIRST_APPLICATION_UID) return false;

        if (isSystem(uid)) return false;





        final boolean networkMetered;

        final boolean networkMetered;

        final int uidRules;

        final int uidRules;
@@ -4046,12 +4044,18 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        return false;

        return false;

    }

    }





    private boolean isSystem(int uid) {

        return uid < Process.FIRST_APPLICATION_UID;

    }





    private void enforceMeteredApnPolicy(NetworkCapabilities networkCapabilities) {

    private void enforceMeteredApnPolicy(NetworkCapabilities networkCapabilities) {

        final int uid = Binder.getCallingUid();

        if (isSystem(uid)) {

            return;

        }

        // if UID is restricted, don't allow them to bring up metered APNs

        // if UID is restricted, don't allow them to bring up metered APNs

        if (networkCapabilities.hasCapability(NET_CAPABILITY_NOT_METERED) == false) {

        if (networkCapabilities.hasCapability(NET_CAPABILITY_NOT_METERED) == false) {

            final int uidRules;

            final int uidRules;

            final int uid = Binder.getCallingUid();

            synchronized(mRulesLock) {

            synchronized(mRulesLock) {

                uidRules = mUidRules.get(uid, RULE_ALLOW_ALL);

                uidRules = mUidRules.get(uid, RULE_ALLOW_ALL);

            }

            }

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -2044,6 +2044,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
    }

    }





    private void setRestrictBackgroundUL(boolean restrictBackground) {

    private void setRestrictBackgroundUL(boolean restrictBackground) {

        Slog.d(TAG, "setRestrictBackgroundUL(): " + restrictBackground);

        final boolean oldRestrictBackground = mRestrictBackground;

        final boolean oldRestrictBackground = mRestrictBackground;

        mRestrictBackground = restrictBackground;

        mRestrictBackground = restrictBackground;

        // Must whitelist foreground apps before turning data saver mode on.

        // Must whitelist foreground apps before turning data saver mode on.