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

Commit 440fa1bd authored by Uldiniad's avatar Uldiniad Committed by Bruno Martins
Browse files

Settings: per-app cellular data, vpn and wifi restrictions 

*) Add options to disable all cellular, vpn and wifi data
   in app data usage settings.

*) Disable the existing background data and unrestricted
   data usage options when all cellular data access is
   disabled.

*) The vpn data option can be selected independently from state of
   all Wi-Fi and mobile data access enable/disable.

*) Prevent DataSaverBackend from overwriting uid policies

This is a replacement for the appops menu based cell/wifi data
restriction settings in cm-13.0:
Author: Danesh M <daneshm90@gmail.com>
Date:   Mon Mar 7 15:17:59 2016 -0800
    Settings : Add per app internet/data control
    CYAN-3976
    CRACKLING-834
    Change-Id: I13192df837c057b5cadde8f31532e12daaf3c1b0

Change-Id: Ic087c27a5ed0bdb84bb8f297c425c6bcbffec848
(cherry picked from commit d4a2eea6)
parent 4df62dfa

res/values/cm_strings.xml

+8 −0
Original line number Diff line number Diff line
@@ -111,6 +111,14 @@ 
    <string name="app_notification_sound_timeout_value_15_minutes">10 minutes</string>

    <string name="app_notification_sound_timeout_value_30_minutes">30 minutes</string>



    <!-- Per-app data restrictions -->

    <string name="data_usage_app_restrict_mobile">Mobile data</string>

    <string name="data_usage_app_restrict_mobile_summary">Enable usage of mobile data</string>

    <string name="data_usage_app_restrict_vpn">VPN data</string>

    <string name="data_usage_app_restrict_vpn_summary">Enable usage of VPN data</string>

    <string name="data_usage_app_restrict_wifi">Wi\u2011Fi data</string>

    <string name="data_usage_app_restrict_wifi_summary">Enable usage of Wi\u2011Fi data</string>



    <!-- PIN scramble -->

    <string name="unlock_scramble_pin_layout_title">Scramble layout</string>

    <string name="unlock_scramble_pin_layout_summary">Scramble PIN layout when unlocking device</string>

res/xml/app_data_usage.xml

+15 −0
Original line number Diff line number Diff line
@@ -55,6 +55,16 @@ 
            android:key="app_settings"

            android:title="@string/data_usage_app_settings" />



        <com.android.settingslib.RestrictedSwitchPreference

            android:key="restrict_wifi"

            android:title="@string/data_usage_app_restrict_wifi"

            android:summary="@string/data_usage_app_restrict_wifi_summary" />



        <com.android.settingslib.RestrictedSwitchPreference

            android:key="restrict_cellular"

            android:title="@string/data_usage_app_restrict_mobile"

            android:summary="@string/data_usage_app_restrict_mobile_summary" />



        <com.android.settingslib.RestrictedSwitchPreference

            android:key="restrict_background"

            android:title="@string/data_usage_app_restrict_background"
@@ -62,6 +72,11 @@ 
            settings:useAdditionalSummary="true"

            settings:restrictedSwitchSummary="@string/disabled_by_admin" />



        <com.android.settingslib.RestrictedSwitchPreference

            android:key="restrict_vpn"

            android:title="@string/data_usage_app_restrict_vpn"

            android:summary="@string/data_usage_app_restrict_vpn_summary" />



        <com.android.settingslib.RestrictedSwitchPreference

            android:key="unrestricted_data_saver"

            android:title="@string/unrestricted_app_title"

src/com/android/settings/datausage/AppDataUsage.java

+103 −12
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ 
package com.android.settings.datausage;



import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;

import static android.net.NetworkPolicyManager.POLICY_REJECT_CELLULAR;

import static android.net.NetworkPolicyManager.POLICY_REJECT_VPN;

import static android.net.NetworkPolicyManager.POLICY_REJECT_WIFI;



import android.app.Activity;

import android.app.settings.SettingsEnums;
@@ -23,6 +26,7 @@ import android.content.Intent; 
import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.graphics.drawable.Drawable;

import android.net.NetworkPolicyManager;

import android.net.NetworkTemplate;

import android.os.Bundle;

import android.os.UserHandle;
@@ -70,6 +74,9 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC 
    private static final String KEY_BACKGROUND_USAGE = "background_usage";

    private static final String KEY_APP_SETTINGS = "app_settings";

    private static final String KEY_RESTRICT_BACKGROUND = "restrict_background";

    private static final String KEY_RESTRICT_CELLULAR = "restrict_cellular";

    private static final String KEY_RESTRICT_VPN = "restrict_vpn";

    private static final String KEY_RESTRICT_WIFI = "restrict_wifi";

    private static final String KEY_APP_LIST = "app_list";

    private static final String KEY_CYCLE = "cycle";

    private static final String KEY_UNRESTRICTED_DATA = "unrestricted_data_saver";
@@ -84,6 +91,9 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC 
    private Preference mBackgroundUsage;

    private Preference mAppSettings;

    private RestrictedSwitchPreference mRestrictBackground;

    private RestrictedSwitchPreference mRestrictCellular;

    private RestrictedSwitchPreference mRestrictVpn;

    private RestrictedSwitchPreference mRestrictWifi;

    private PreferenceCategory mAppList;



    private Drawable mIcon;
@@ -156,6 +166,9 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC 
                mLabel = uidDetail.label;

                removePreference(KEY_UNRESTRICTED_DATA);

                removePreference(KEY_RESTRICT_BACKGROUND);

                removePreference(KEY_RESTRICT_CELLULAR);

                removePreference(KEY_RESTRICT_VPN);

                removePreference(KEY_RESTRICT_WIFI);

            } else {

                if (mPackages.size() != 0) {

                    try {
@@ -169,6 +182,12 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC 
                }

                mRestrictBackground = findPreference(KEY_RESTRICT_BACKGROUND);

                mRestrictBackground.setOnPreferenceChangeListener(this);

                mRestrictCellular = findPreference(KEY_RESTRICT_CELLULAR);

                mRestrictCellular.setOnPreferenceChangeListener(this);

                mRestrictVpn = findPreference(KEY_RESTRICT_VPN);

                mRestrictVpn.setOnPreferenceChangeListener(this);

                mRestrictWifi = findPreference(KEY_RESTRICT_WIFI);

                mRestrictWifi.setOnPreferenceChangeListener(this);

                mUnrestrictedData = findPreference(KEY_UNRESTRICTED_DATA);

                mUnrestrictedData.setOnPreferenceChangeListener(this);

            }
@@ -209,6 +228,9 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC 
            removePreference(KEY_UNRESTRICTED_DATA);

            removePreference(KEY_APP_SETTINGS);

            removePreference(KEY_RESTRICT_BACKGROUND);

            removePreference(KEY_RESTRICT_CELLULAR);

            removePreference(KEY_RESTRICT_VPN);

            removePreference(KEY_RESTRICT_WIFI);

            removePreference(KEY_APP_LIST);

        }

    }
@@ -238,6 +260,18 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC 
            mDataSaverBackend.setIsBlacklisted(mAppItem.key, mPackageName, !(Boolean) newValue);

            updatePrefs();

            return true;

        } else if (preference == mRestrictCellular) {

            setAppRestrictCellular(!(Boolean) newValue);

            updatePrefs();

            return true;

        } else if (preference == mRestrictVpn) {

            setAppRestrictVpn(!(Boolean) newValue);

            updatePrefs();

            return true;

        } else if (preference == mRestrictWifi) {

            setAppRestrictWifi(!(Boolean) newValue);

            updatePrefs();

            return true;

        } else if (preference == mUnrestrictedData) {

            mDataSaverBackend.setIsWhitelisted(mAppItem.key, mPackageName, (Boolean) newValue);

            return true;
@@ -268,7 +302,8 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC 


    @VisibleForTesting

    void updatePrefs() {

        updatePrefs(getAppRestrictBackground(), getUnrestrictData());

        updatePrefs(getAppRestrictBackground(), getUnrestrictData(),

                getAppRestrictCellular(), getAppRestrictVpn(), getAppRestrictWifi());

    }



    @VisibleForTesting
@@ -276,21 +311,38 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC 
        return new UidDetailProvider(mContext);

    }



    private void updatePrefs(boolean restrictBackground, boolean unrestrictData) {

    private void updatePrefs(boolean restrictBackground, boolean unrestrictData,

            boolean restrictCellular, boolean restrictVpn, boolean restrictWifi) {

        final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfMeteredDataRestricted(

                mContext, mPackageName, UserHandle.getUserId(mAppItem.key));

        if (mRestrictBackground != null) {

            if (restrictCellular) {

                mRestrictBackground.setEnabled(false);

                mRestrictBackground.setChecked(false);

            } else {

                mRestrictBackground.setEnabled(true);

                mRestrictBackground.setChecked(!restrictBackground);

            }

            mRestrictBackground.setDisabledByAdmin(admin);

        }

        if (mRestrictCellular != null) {

            mRestrictCellular.setChecked(!restrictCellular);

        }

        if (mRestrictVpn != null) {

            mRestrictVpn.setChecked(!restrictVpn);

        }

        if (mRestrictWifi != null) {

            mRestrictWifi.setChecked(!restrictWifi);

        }

        if (mUnrestrictedData != null) {

            if (restrictBackground) {

                mUnrestrictedData.setVisible(false);

            if (restrictCellular || restrictBackground) {

                mUnrestrictedData.setEnabled(false);

                mUnrestrictedData.setChecked(false);

            } else {

                mUnrestrictedData.setVisible(true);

                mUnrestrictedData.setEnabled(true);

                mUnrestrictedData.setChecked(unrestrictData);

                mUnrestrictedData.setDisabledByAdmin(admin);

            }

            mUnrestrictedData.setDisabledByAdmin(admin);

        }

    }
@@ -323,9 +375,19 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC 
    }



    private boolean getAppRestrictBackground() {

        final int uid = mAppItem.key;

        final int uidPolicy = services.mPolicyManager.getUidPolicy(uid);

        return (uidPolicy & POLICY_REJECT_METERED_BACKGROUND) != 0;

        return getAppRestriction(POLICY_REJECT_METERED_BACKGROUND);

    }



    private boolean getAppRestrictCellular() {

        return getAppRestriction(POLICY_REJECT_CELLULAR);

    }



    private boolean getAppRestrictVpn() {

        return getAppRestriction(POLICY_REJECT_VPN);

    }



    private boolean getAppRestrictWifi() {

        return getAppRestriction(POLICY_REJECT_WIFI);

    }



    private boolean getUnrestrictData() {
@@ -335,6 +397,33 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC 
        return false;

    }



    private boolean getAppRestriction(int policy) {

        final int uid = mAppItem.key;

        final int uidPolicy = services.mPolicyManager.getUidPolicy(uid);

        return (uidPolicy & policy) != 0;

    }



    private void setAppRestrictCellular(boolean restrict) {

        setAppRestriction(POLICY_REJECT_CELLULAR, restrict);

    }



    private void setAppRestrictVpn(boolean restrict) {

        setAppRestriction(POLICY_REJECT_VPN, restrict);

    }



    private void setAppRestrictWifi(boolean restrict) {

        setAppRestriction(POLICY_REJECT_WIFI, restrict);

    }



    private void setAppRestriction(int policy, boolean restrict) {

        final int uid = mAppItem.key;

        if (restrict) {

            services.mPolicyManager.addUidPolicy(uid, policy);

        } else {

            services.mPolicyManager.removeUidPolicy(uid, policy);

        }

    }



    @Override

    public void onViewCreated(View view, Bundle savedInstanceState) {

        super.onViewCreated(view, savedInstanceState);
@@ -466,14 +555,16 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC 
    @Override

    public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {

        if (mAppItem.uids.get(uid, false)) {

            updatePrefs(getAppRestrictBackground(), isWhitelisted);

            updatePrefs(getAppRestrictBackground(), isWhitelisted,

                    getAppRestrictCellular(), getAppRestrictVpn(), getAppRestrictWifi());

        }

    }



    @Override

    public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {

        if (mAppItem.uids.get(uid, false)) {

            updatePrefs(isBlacklisted, getUnrestrictData());

            updatePrefs(isBlacklisted, getUnrestrictData(),

                    getAppRestrictCellular(), getAppRestrictVpn(), getAppRestrictWifi());

        }

    }

}

src/com/android/settings/datausage/DataSaverBackend.java

+11 −2
Original line number Diff line number Diff line
@@ -83,12 +83,15 @@ public class DataSaverBackend { 


    public void setIsWhitelisted(int uid, String packageName, boolean whitelisted) {

        final int policy = whitelisted ? POLICY_ALLOW_METERED_BACKGROUND : POLICY_NONE;

        mPolicyManager.setUidPolicy(uid, policy);

        mUidPolicies.put(uid, policy);

        if (whitelisted) {

            mPolicyManager.addUidPolicy(uid, POLICY_ALLOW_METERED_BACKGROUND);

            mMetricsFeatureProvider.action(

                    mContext, SettingsEnums.ACTION_DATA_SAVER_WHITELIST, packageName);

        } else {

            mPolicyManager.removeUidPolicy(uid, POLICY_ALLOW_METERED_BACKGROUND);

        }

        mPolicyManager.removeUidPolicy(uid, POLICY_REJECT_METERED_BACKGROUND);

    }



    public boolean isWhitelisted(int uid) {
@@ -113,12 +116,15 @@ public class DataSaverBackend { 


    public void setIsBlacklisted(int uid, String packageName, boolean blacklisted) {

        final int policy = blacklisted ? POLICY_REJECT_METERED_BACKGROUND : POLICY_NONE;

        mPolicyManager.setUidPolicy(uid, policy);

        mUidPolicies.put(uid, policy);

        if (blacklisted) {

            mPolicyManager.addUidPolicy(uid, POLICY_REJECT_METERED_BACKGROUND);

            mMetricsFeatureProvider.action(

                    mContext, SettingsEnums.ACTION_DATA_SAVER_BLACKLIST, packageName);

        } else {

            mPolicyManager.removeUidPolicy(uid, POLICY_REJECT_METERED_BACKGROUND);

        }

        mPolicyManager.removeUidPolicy(uid, POLICY_ALLOW_METERED_BACKGROUND);

    }



    public boolean isBlacklisted(int uid) {
@@ -158,6 +164,9 @@ public class DataSaverBackend { 
        loadWhitelist();

        loadBlacklist();



        // We only care about allow/reject metered background policy here.

        newPolicy &= POLICY_ALLOW_METERED_BACKGROUND | POLICY_REJECT_METERED_BACKGROUND;



        final int oldPolicy = mUidPolicies.get(uid, POLICY_NONE);

        if (newPolicy == POLICY_NONE) {

            mUidPolicies.delete(uid);