commit 932bb2ee02b686358a973698ed7244058e27549a
author Matthew Fritze <mfritze@google.com> Wed Sep 14 09:30:01 2016 -0700
committer Matthew Fritze <mfritze@google.com> Wed Sep 14 09:30:01 2016 -0700
tree 386793e12459362d6347a5ee3b210d69fd00ee11
parent 14e9535fc83a889c14aa9ad7ac4d2b665fccc0dc
parent a04bf124e6cc69b84ec9fc733cbb6cb37010db50

resolve merge conflicts of a04bf12 to master

Change-Id: Ie8b93666d98832af510e76ec50af964e2460743b

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

diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index 6040d48..864ae95 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -20,7 +20,6 @@
 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;
@@ -71,7 +70,7 @@
     private static final String KEY_RESTRICT_BACKGROUND = "restrict_background";
 
     private DataUsageController mDataUsageController;
-    private DataUsageInfoController mDataInfoControler;
+    private DataUsageInfoController mDataInfoController;
     private SummaryPreference mSummaryPreference;
     private Preference mLimitPreference;
     private NetworkTemplate mDefaultTemplate;
@@ -83,7 +82,7 @@
 
         boolean hasMobileData = hasMobileData(getContext());
         mDataUsageController = new DataUsageController(getContext());
-        mDataInfoControler = new DataUsageInfoController();
+        mDataInfoController = new DataUsageInfoController();
         addPreferencesFromResource(R.xml.data_usage);
 
         int defaultSubId = getDefaultSubscriptionId(getContext());
@@ -227,13 +226,13 @@
         DataUsageController.DataUsageInfo info = mDataUsageController.getDataUsageInfo(
                 mDefaultTemplate);
         Context context = getContext();
-        mDataInfoControler.updateDataLimit(info,
+        mDataInfoController.updateDataLimit(info,
                 services.mPolicyEditor.getPolicy(mDefaultTemplate));
 
         if (mSummaryPreference != null) {
             mSummaryPreference.setTitle(
                     formatTitle(context, getString(mDataUsageTemplate), info.usageLevel));
-            long limit = mDataInfoControler.getSummaryLimit(info);
+            long limit = mDataInfoController.getSummaryLimit(info);
             mSummaryPreference.setSummary(info.period);
             mSummaryPreference.setLabels(Formatter.formatFileSize(context, 0),
                     Formatter.formatFileSize(context, limit));