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

Commit 5f4dafb4 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Block metered APNs when app is restricted. 

When an app is restricted in the background, don't allow them to
start using metered network features. With this change they can
still use network features when in foreground. This avoids situation
where apps can bring up APNs which they are unable to use.

Bug: 5838267
Change-Id: I3ac96f2a545f67cba1ef12b8536cfd0da769d955
parent f2dc6fc4

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

+24 −11
Original line number Diff line number Diff line
@@ -884,10 +884,16 @@ private NetworkStateTracker makeWimaxStateTracker() { 
    @Override

    public boolean isActiveNetworkMetered() {

        enforceAccessPermission();



        final long token = Binder.clearCallingIdentity();

        try {

            final NetworkState state = getNetworkStateUnchecked(mActiveDefaultNetwork);

            return isNetworkMeteredUnchecked(mActiveDefaultNetwork);

        } finally {

            Binder.restoreCallingIdentity(token);

        }

    }



    private boolean isNetworkMeteredUnchecked(int networkType) {

        final NetworkState state = getNetworkStateUnchecked(networkType);

        if (state != null) {

            try {

                return mPolicyManager.isNetworkMetered(state);
@@ -895,9 +901,6 @@ private NetworkStateTracker makeWimaxStateTracker() { 
            }

        }

        return false;

        } finally {

            Binder.restoreCallingIdentity(token);

        }

    }



    public boolean setRadios(boolean turnOn) {
@@ -993,7 +996,8 @@ private NetworkStateTracker makeWimaxStateTracker() { 
    public int startUsingNetworkFeature(int networkType, String feature,

            IBinder binder) {

        if (VDBG) {

            log("startUsingNetworkFeature for net " + networkType + ": " + feature);

            log("startUsingNetworkFeature for net " + networkType + ": " + feature + ", uid="

                    + Binder.getCallingUid());

        }

        enforceChangePermission();

        if (!ConnectivityManager.isNetworkTypeValid(networkType) ||
@@ -1010,6 +1014,16 @@ private NetworkStateTracker makeWimaxStateTracker() { 
            enforceConnectivityInternalPermission();

        }



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

        final boolean networkMetered = isNetworkMeteredUnchecked(usedNetworkType);

        final int uidRules;

        synchronized (mRulesLock) {

            uidRules = mUidRules.get(Binder.getCallingUid(), RULE_ALLOW_ALL);

        }

        if (networkMetered && (uidRules & RULE_REJECT_METERED) != 0) {

            return Phone.APN_REQUEST_FAILED;

        }



        NetworkStateTracker network = mNetTrackers[usedNetworkType];

        if (network != null) {

            Integer currentPid = new Integer(getCallingPid());
@@ -1432,7 +1446,6 @@ private NetworkStateTracker makeWimaxStateTracker() { 
                mUidRules.put(uid, uidRules);

            }



            // TODO: dispatch into NMS to push rules towards kernel module

            // TODO: notify UID when it has requested targeted updates

        }