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

Commit 28879a71 authored by Uldiniad's avatar Uldiniad Committed by Łukasz Patron
Browse files

[1/3] Settings: per-app cellular data and wifi restrictions 

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

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

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
parent 7693ead1

res/values/cm_strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -359,4 +359,10 @@ 
    <!-- Touchscreen hovering -->

    <string name="touchscreen_hovering_title">Touchscreen hovering</string>

    <string name="touchscreen_hovering_summary">Allows you to hover the screen like a mouse in web browsers, remote desktops, etc</string>



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

    <string name="data_usage_app_restrict_data">Cellular data</string>

    <string name="data_usage_app_restrict_data_summary">Enable usage of cellular 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>

</resources>

res/xml/app_data_usage.xml

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

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



        <SwitchPreference

            android:key="restrict_wlan"

            android:title="@string/data_usage_app_restrict_wifi"

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



        <SwitchPreference

            android:key="restrict_data"

            android:title="@string/data_usage_app_restrict_data"

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



        <SwitchPreference

            android:key="restrict_background"

            android:title="@string/data_usage_app_restrict_background"

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

+82 −11
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
package com.android.settings.datausage;



import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;

import static android.net.NetworkPolicyManager.POLICY_REJECT_ON_DATA;

import static android.net.NetworkPolicyManager.POLICY_REJECT_ON_WLAN;



import android.app.Activity;

import android.app.LoaderManager;
@@ -26,6 +28,7 @@ import android.content.pm.PackageManager; 
import android.graphics.drawable.Drawable;

import android.net.INetworkStatsSession;

import android.net.NetworkPolicy;

import android.net.NetworkPolicyManager;

import android.net.NetworkStatsHistory;

import android.net.NetworkTemplate;

import android.net.TrafficStats;
@@ -68,6 +71,8 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen 
    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_DATA = "restrict_data";

    private static final String KEY_RESTRICT_WLAN = "restrict_wlan";

    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";
@@ -82,6 +87,8 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen 
    private Preference mBackgroundUsage;

    private Preference mAppSettings;

    private SwitchPreference mRestrictBackground;

    private SwitchPreference mRestrictData;

    private SwitchPreference mRestrictWlan;

    private PreferenceCategory mAppList;



    private Drawable mIcon;
@@ -95,6 +102,7 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen 
    private ChartData mChartData;

    private NetworkTemplate mTemplate;

    private NetworkPolicy mPolicy;

    private NetworkPolicyManager mPolicyManager;

    private AppItem mAppItem;

    private Intent mAppSettingsIntent;

    private SpinnerPreference mCycle;
@@ -113,6 +121,7 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen 
            throw new RuntimeException(e);

        }



        mPolicyManager = NetworkPolicyManager.from(getContext());

        mAppItem = (args != null) ? (AppItem) args.getParcelable(ARG_APP_ITEM) : null;

        mTemplate = (args != null) ? (NetworkTemplate) args.getParcelable(ARG_NETWORK_TEMPLATE)

                : null;
@@ -160,9 +169,15 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen 
            if (!UserHandle.isApp(mAppItem.key)) {

                removePreference(KEY_UNRESTRICTED_DATA);

                removePreference(KEY_RESTRICT_BACKGROUND);

                removePreference(KEY_RESTRICT_DATA);

                removePreference(KEY_RESTRICT_WLAN);

            } else {

                mRestrictBackground = (SwitchPreference) findPreference(KEY_RESTRICT_BACKGROUND);

                mRestrictBackground.setOnPreferenceChangeListener(this);

                mRestrictData = (SwitchPreference) findPreference(KEY_RESTRICT_DATA);

                mRestrictData.setOnPreferenceChangeListener(this);

                mRestrictWlan = (SwitchPreference) findPreference(KEY_RESTRICT_WLAN);

                mRestrictWlan.setOnPreferenceChangeListener(this);

                mUnrestrictedData = (SwitchPreference) findPreference(KEY_UNRESTRICTED_DATA);

                mUnrestrictedData.setOnPreferenceChangeListener(this);

            }
@@ -202,6 +217,8 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen 
            removePreference(KEY_UNRESTRICTED_DATA);

            removePreference(KEY_APP_SETTINGS);

            removePreference(KEY_RESTRICT_BACKGROUND);

            removePreference(KEY_RESTRICT_DATA);

            removePreference(KEY_RESTRICT_WLAN);

            removePreference(KEY_APP_LIST);

        }

    }
@@ -238,6 +255,14 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen 
            mDataSaverBackend.setIsBlacklisted(mAppItem.key, mPackageName, !(Boolean) newValue);

            updatePrefs();

            return true;

        } else if (preference == mRestrictData) {

            setAppRestrictData(!(Boolean) newValue);

            updatePrefs();

            return true;

        } else if (preference == mRestrictWlan) {

            setAppRestrictWlan(!(Boolean) newValue);

            updatePrefs();

            return true;

        } else if (preference == mUnrestrictedData) {

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

            return true;
@@ -258,18 +283,33 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen 


    @VisibleForTesting

    void updatePrefs() {

        updatePrefs(getAppRestrictBackground(), getUnrestrictData());

        updatePrefs(getAppRestrictBackground(), getUnrestrictData(),

                getAppRestrictData(), getAppRestrictWlan());

    }



    private void updatePrefs(boolean restrictBackground, boolean unrestrictData) {

    private void updatePrefs(boolean restrictBackground, boolean unrestrictData,

            boolean restrictData, boolean restrictWlan) {

        if (mRestrictBackground != null) {

            if (restrictData) {

                mRestrictBackground.setEnabled(false);

                mRestrictBackground.setChecked(false);

            } else {

                mRestrictBackground.setEnabled(true);

                mRestrictBackground.setChecked(!restrictBackground);

            }

        }

        if (mRestrictData != null) {

            mRestrictData.setChecked(!restrictData);

        }

        if (mRestrictWlan != null) {

            mRestrictWlan.setChecked(!restrictWlan);

        }

        if (mUnrestrictedData != null) {

            if (restrictBackground) {

                mUnrestrictedData.setVisible(false);

            if (restrictData || restrictBackground) {

                mUnrestrictedData.setEnabled(false);

                mUnrestrictedData.setChecked(false);

            } else {

                mUnrestrictedData.setVisible(true);

                mUnrestrictedData.setEnabled(true);

                mUnrestrictedData.setChecked(unrestrictData);

            }

        }
@@ -307,9 +347,15 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen 
    }



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

        return getAppRestriction(POLICY_REJECT_ON_DATA);

    }



    private boolean getAppRestrictWlan() {

        return getAppRestriction(POLICY_REJECT_ON_WLAN);

    }



    private boolean getUnrestrictData() {
@@ -319,6 +365,29 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen 
        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 setAppRestrictData(boolean restrict) {

        setAppRestriction(POLICY_REJECT_ON_DATA, restrict);

    }



    private void setAppRestrictWlan(boolean restrict) {

        setAppRestriction(POLICY_REJECT_ON_WLAN, restrict);

    }



    private void setAppRestriction(int policy, boolean restrict) {

        final int uid = mAppItem.key;

        if (restrict) {

            mPolicyManager.addUidPolicy(uid, policy);

        } else {

            mPolicyManager.removeUidPolicy(uid, policy);

        }

    }



    @Override

    public void onViewCreated(View view, Bundle savedInstanceState) {

        super.onViewCreated(view, savedInstanceState);
@@ -422,14 +491,16 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen 
    @Override

    public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {

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

            updatePrefs(getAppRestrictBackground(), isWhitelisted);

            updatePrefs(getAppRestrictBackground(), isWhitelisted,

                    getAppRestrictData(), getAppRestrictWlan());

        }

    }



    @Override

    public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {

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

            updatePrefs(isBlacklisted, getUnrestrictData());

            updatePrefs(isBlacklisted, getUnrestrictData(),

                    getAppRestrictData(), getAppRestrictWlan());

        }

    }

}