From 1a3e41d629c269dc66531cef0fb331ac94e5c273 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Thu, 16 Jun 2011 15:08:08 -0700 Subject: [PATCH] Refactor network policy: paid to metered. Also bind policy checkbox correctly. Bug: 4691427 Change-Id: Ib05b39c391bf59582106afff5599d62a04c3c75b --- src/com/android/settings/DataUsageAppDetail.java | 10 ++++------ src/com/android/settings/DataUsageSummary.java | 1 - 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/com/android/settings/DataUsageAppDetail.java b/src/com/android/settings/DataUsageAppDetail.java index cee54ee2669..0d15dac1570 100644 --- a/src/com/android/settings/DataUsageAppDetail.java +++ b/src/com/android/settings/DataUsageAppDetail.java @@ -17,7 +17,7 @@ package com.android.settings; import static android.net.NetworkPolicyManager.POLICY_NONE; -import static android.net.NetworkPolicyManager.POLICY_REJECT_PAID_BACKGROUND; +import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND; import static android.net.TrafficStats.TEMPLATE_MOBILE_ALL; import static com.android.settings.DataUsageSummary.getHistoryBounds; @@ -76,8 +76,6 @@ public class DataUsageAppDetail extends Fragment { private LinearLayout mSwitches; private DataUsageChartView mChart; - - private int mUidPolicy; private NetworkStatsHistory mHistory; @Override @@ -185,7 +183,7 @@ public class DataUsageAppDetail extends Fragment { } // update policy checkbox - final boolean restrictBackground = (mUidPolicy & POLICY_REJECT_PAID_BACKGROUND) != 0; + final boolean restrictBackground = (uidPolicy & POLICY_REJECT_METERED_BACKGROUND) != 0; mRestrictBackground.setChecked(restrictBackground); // kick preference views so they rebind from changes above @@ -210,7 +208,7 @@ public class DataUsageAppDetail extends Fragment { if (LOGD) Log.d(TAG, "setRestrictBackground()"); try { mPolicyService.setUidPolicy( - mUid, restrictBackground ? POLICY_REJECT_PAID_BACKGROUND : POLICY_NONE); + mUid, restrictBackground ? POLICY_REJECT_METERED_BACKGROUND : POLICY_NONE); } catch (RemoteException e) { throw new RuntimeException("unable to save policy", e); } @@ -269,7 +267,7 @@ public class DataUsageAppDetail extends Fragment { /** * Dialog to request user confirmation before setting - * {@link #POLICY_REJECT_PAID_BACKGROUND}. + * {@link #POLICY_REJECT_METERED_BACKGROUND}. */ public static class ConfirmRestrictFragment extends DialogFragment { public static void show(DataUsageAppDetail parent) { diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java index eafd22b1ec8..087525c693f 100644 --- a/src/com/android/settings/DataUsageSummary.java +++ b/src/com/android/settings/DataUsageSummary.java @@ -18,7 +18,6 @@ package com.android.settings; import static android.net.NetworkPolicy.LIMIT_DISABLED; import static android.net.NetworkPolicyManager.ACTION_DATA_USAGE_LIMIT; -import static android.net.NetworkPolicyManager.ACTION_DATA_USAGE_WARNING; import static android.net.NetworkPolicyManager.EXTRA_NETWORK_TEMPLATE; import static android.net.NetworkPolicyManager.computeLastCycleBoundary; import static android.net.NetworkPolicyManager.computeNextCycleBoundary;