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

Merge "Make cell data usage an array"

Browse Source
This commit is contained in:
Jason Monk
2016-02-03 22:05:57 +00:00
committed by Android (Google) Code Review
parent 4a05b2906f f3f6bd47fe
commit 0eb0d9bfe3
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/SettingsDumpService.java
View File

@@ -14,24 +14,21 @@
package com.android.settings; 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.app.Service;
import android.content.Intent; import android.content.Intent;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.NetworkTemplate; import android.net.NetworkTemplate;
import android.os.IBinder; import android.os.IBinder;
import android.os.storage.StorageManager; import android.os.storage.StorageManager;
import android.os.storage.StorageVolume;
import android.os.storage.VolumeInfo; import android.os.storage.VolumeInfo;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; 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.File;
import java.io.FileDescriptor; import java.io.FileDescriptor;
@@ -81,12 +78,15 @@ public class SettingsDumpService extends Service {
SubscriptionManager manager = SubscriptionManager.from(this); SubscriptionManager manager = SubscriptionManager.from(this);
TelephonyManager telephonyManager = TelephonyManager.from(this); TelephonyManager telephonyManager = TelephonyManager.from(this);
if (connectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)) { if (connectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)) {
JSONArray array = new JSONArray();
for (SubscriptionInfo info : manager.getAllSubscriptionInfoList()) { for (SubscriptionInfo info : manager.getAllSubscriptionInfoList()) {
NetworkTemplate mobileAll = NetworkTemplate.buildTemplateMobileAll( NetworkTemplate mobileAll = NetworkTemplate.buildTemplateMobileAll(
telephonyManager.getSubscriberId(info.getSubscriptionId())); telephonyManager.getSubscriberId(info.getSubscriptionId()));
obj.put("cell(" + info.getSubscriptionId() + ")", final JSONObject usage = dumpDataUsage(mobileAll, controller);
dumpDataUsage(mobileAll, controller)); usage.put("subId", info.getSubscriptionId());
array.put(usage);
} }
obj.put("cell", array);
} }
if (connectivityManager.isNetworkSupported(ConnectivityManager.TYPE_WIFI)) { if (connectivityManager.isNetworkSupported(ConnectivityManager.TYPE_WIFI)) {
obj.put("wifi", dumpDataUsage(NetworkTemplate.buildTemplateWifiWildcard(), controller)); obj.put("wifi", dumpDataUsage(NetworkTemplate.buildTemplateWifiWildcard(), controller));