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

Commit bf60154a authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Leave unmetered Wi-Fi network policies intact. 

They are now removed when the WifiConfiguration is deleted.

Bug: 6344821, 6369307
Change-Id: Id411fa06cec10435501ef03c56d0bcb96ed229db
parent fcc5063e

src/com/android/settings/net/DataUsageMeteredSettings.java

+1 −10
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settings.net;



import static android.net.wifi.WifiInfo.removeDoubleQuotes;

import static com.android.settings.DataUsageSummary.hasReadyMobileRadio;

import static com.android.settings.DataUsageSummary.hasWifiRadio;
@@ -120,14 +121,4 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment { 
            mPolicyEditor.setPolicyMetered(mTemplate, isChecked());

        }

    }





    private static String removeDoubleQuotes(String string) {

        final int length = string.length();

        if ((length > 1) && (string.charAt(0) == '"') && (string.charAt(length - 1) == '"')) {

            return string.substring(1, length - 1);

        }

        return string;

    }



}

src/com/android/settings/net/NetworkPolicyEditor.java

+0 −7
Original line number Diff line number Diff line
@@ -214,13 +214,6 @@ public class NetworkPolicyEditor { 
        } else {

            if (policy == null) {

                // ignore when policy doesn't exist

            } else if (policy.template.getMatchRule() == MATCH_WIFI

                    && policy.warningBytes == WARNING_DISABLED

                    && policy.limitBytes == LIMIT_DISABLED) {

                // when WIFI goes unmetered, and no other warning/limit for

                // policy, clean it up.

                mPolicies.remove(policy);

                modified = true;

            } else if (policy.metered) {

                policy.metered = false;

                policy.inferred = false;