commit 0eb0d9bfe370c7150b86b9e3a624b68a9f75c79e
author Jason Monk <jmonk@google.com> Wed Feb 03 22:05:57 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 03 22:05:57 2016 +0000
tree 49ce7f7676e5aa6284027aa672203efd5a7e4a8c
parent 4a05b2906fdb94e11c7d3b9f249e33a81fe707e4
parent f3f6bd47fedbcdf34f15e7ef959aa8a3c08fb6af

Merge "Make cell data usage an array"

src/com/android/settings/SettingsDumpService.java

diff --git a/src/com/android/settings/SettingsDumpService.java b/src/com/android/settings/SettingsDumpService.java
index cd9ef01..472a2eb 100644
--- a/src/com/android/settings/SettingsDumpService.java
+++ b/src/com/android/settings/SettingsDumpService.java
@@ -14,24 +14,21 @@
 
 package com.android.settings;
 
-import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.applications.ProcStatsData;
-import com.android.settingslib.net.DataUsageController;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.app.Service;
 import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.NetworkTemplate;
 import android.os.IBinder;
 import android.os.storage.StorageManager;
-import android.os.storage.StorageVolume;
 import android.os.storage.VolumeInfo;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import com.android.settings.applications.ProcStatsData;
+import com.android.settingslib.net.DataUsageController;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.io.File;
 import java.io.FileDescriptor;
@@ -81,12 +78,15 @@
         SubscriptionManager manager = SubscriptionManager.from(this);
         TelephonyManager telephonyManager = TelephonyManager.from(this);
         if (connectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)) {
+            JSONArray array = new JSONArray();
             for (SubscriptionInfo info : manager.getAllSubscriptionInfoList()) {
                 NetworkTemplate mobileAll = NetworkTemplate.buildTemplateMobileAll(
                         telephonyManager.getSubscriberId(info.getSubscriptionId()));
-                obj.put("cell(" + info.getSubscriptionId() + ")",
-                        dumpDataUsage(mobileAll, controller));
+                final JSONObject usage = dumpDataUsage(mobileAll, controller);
+                usage.put("subId", info.getSubscriptionId());
+                array.put(usage);
             }
+            obj.put("cell", array);
         }
         if (connectivityManager.isNetworkSupported(ConnectivityManager.TYPE_WIFI)) {
             obj.put("wifi", dumpDataUsage(NetworkTemplate.buildTemplateWifiWildcard(), controller));