resolve merge conflicts of e6431c7 to master
Change-Id: I9d3c5fd5c8b73add93894a21d2f17ed0ae442a32
diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java
index 1936e5b..c26efee 100644
--- a/src/com/android/settings/datausage/BillingCycleSettings.java
+++ b/src/com/android/settings/datausage/BillingCycleSettings.java
@@ -174,11 +174,13 @@
private View mView;
public static void show(DataUsageEditController parent, boolean isLimit) {
- if (! (parent instanceof Fragment)) {
+ if (!(parent instanceof Fragment)) {
return;
}
Fragment targetFragment = (Fragment) parent;
- if (!targetFragment.isAdded()) return;
+ if (!targetFragment.isAdded()) {
+ return;
+ }
final Bundle args = new Bundle();
args.putParcelable(EXTRA_TEMPLATE, parent.getNetworkTemplate());
diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index 4fcdf30..6040d48 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -20,6 +20,7 @@
import android.content.Intent;
import android.net.ConnectivityManager;
import android.net.INetworkStatsSession;
+import android.net.NetworkPolicy;
import android.net.NetworkTemplate;
import android.net.TrafficStats;
import android.os.Bundle;
@@ -226,7 +227,6 @@
DataUsageController.DataUsageInfo info = mDataUsageController.getDataUsageInfo(
mDefaultTemplate);
Context context = getContext();
-
mDataInfoControler.updateDataLimit(info,
services.mPolicyEditor.getPolicy(mDefaultTemplate));