PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refactor network policy: paid to metered."

Browse Source
This commit is contained in:
Jeff Sharkey
2011-06-17 16:57:30 -07:00
committed by Android (Google) Code Review
parent 0c2857d48b 1a3e41d629
commit fd03deaef6
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/DataUsageAppDetail.java
View File

@@ -17,7 +17,7 @@
package com.android.settings; package com.android.settings;
import static android.net.NetworkPolicyManager.POLICY_NONE; 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 android.net.TrafficStats.TEMPLATE_MOBILE_ALL;
import static com.android.settings.DataUsageSummary.getHistoryBounds; import static com.android.settings.DataUsageSummary.getHistoryBounds;
@@ -76,8 +76,6 @@ public class DataUsageAppDetail extends Fragment {
private LinearLayout mSwitches; private LinearLayout mSwitches;
private DataUsageChartView mChart; private DataUsageChartView mChart;
private int mUidPolicy;
private NetworkStatsHistory mHistory; private NetworkStatsHistory mHistory;
@Override @Override
@@ -185,7 +183,7 @@ public class DataUsageAppDetail extends Fragment {
} }
// update policy checkbox // update policy checkbox
final boolean restrictBackground = (mUidPolicy & POLICY_REJECT_PAID_BACKGROUND) != 0; final boolean restrictBackground = (uidPolicy & POLICY_REJECT_METERED_BACKGROUND) != 0;
mRestrictBackground.setChecked(restrictBackground); mRestrictBackground.setChecked(restrictBackground);
// kick preference views so they rebind from changes above // kick preference views so they rebind from changes above
@@ -210,7 +208,7 @@ public class DataUsageAppDetail extends Fragment {
if (LOGD) Log.d(TAG, "setRestrictBackground()"); if (LOGD) Log.d(TAG, "setRestrictBackground()");
try { try {
mPolicyService.setUidPolicy( mPolicyService.setUidPolicy(
mUid, restrictBackground ? POLICY_REJECT_PAID_BACKGROUND : POLICY_NONE); mUid, restrictBackground ? POLICY_REJECT_METERED_BACKGROUND : POLICY_NONE);
} catch (RemoteException e) { } catch (RemoteException e) {
throw new RuntimeException("unable to save policy", 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 * 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 class ConfirmRestrictFragment extends DialogFragment {
public static void show(DataUsageAppDetail parent) { public static void show(DataUsageAppDetail parent) {

1
src/com/android/settings/DataUsageSummary.java
View File

@@ -18,7 +18,6 @@ package com.android.settings;
import static android.net.NetworkPolicy.LIMIT_DISABLED; import static android.net.NetworkPolicy.LIMIT_DISABLED;
import static android.net.NetworkPolicyManager.ACTION_DATA_USAGE_LIMIT; 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.EXTRA_NETWORK_TEMPLATE;
import static android.net.NetworkPolicyManager.computeLastCycleBoundary; import static android.net.NetworkPolicyManager.computeLastCycleBoundary;
import static android.net.NetworkPolicyManager.computeNextCycleBoundary; import static android.net.NetworkPolicyManager.computeNextCycleBoundary;