Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev am: 38b0d3091d am: d0783f22c0 am: 06483a6af1

Change-Id: I88d156f50d9391b2156f7e96a4e00a03122cc095

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

@@ -114,6 +114,7 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
      */
     public void init(int subscriptionId) {
         mSubId = subscriptionId;
+        mHasMobileData = DataUsageUtils.hasMobileData(mContext);
         mDataUsageController = null;
     }
 
@@ -123,8 +124,6 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
                 context.getSystemService(NetworkPolicyManager.class);
         mPolicyEditor = new NetworkPolicyEditor(policyManager);
 
-        mHasMobileData = DataUsageUtils.hasMobileData(context);
-
         mDataUsageController = new DataUsageController(context);
         mDataUsageController.setSubscriptionId(subscriptionId);
         mDataInfoController = new DataUsageInfoController();