For wifi, a old API: buildTemplateWifiWildcard will includes the merged wifi which is included to mobile usage. It should not double count again. Call new API: buildTemplateWifi with NetworkId: NetworkTemplate.WIFI_NETWORKID_ALL and null subscriberId to get non-merged wifi usage. Test: make RunSettingsRoboTests ROBOTEST_FILTER=AppDataUsageTest Test: make RunSettingsRoboTests ROBOTEST_FILTER=AppDataUsagePreferenceControllerTest Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryTest Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryPreferenceTest Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageUtilsTest Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsDumpServiceTest Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettingsTest Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageInfoControllerTest Test: Manual Test, wifi data usage count correctly. Bug: 176396812 Merged-In: Ia4d8fa67ea3cb75c2d35be9ab60e5c5ffa391ffb Change-Id: Ia4d8fa67ea3cb75c2d35be9ab60e5c5ffa391ffb
195 lines
7.6 KiB
Java
195 lines
7.6 KiB
Java
/*
|
|
* Copyright (C) 2017 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software distributed under the
|
|
* License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
* KIND, either express or implied. See the License for the specific language governing
|
|
* permissions and limitations under the License.
|
|
*/
|
|
|
|
package com.android.settings.datausage;
|
|
|
|
import static android.content.pm.PackageManager.FEATURE_ETHERNET;
|
|
import static android.content.pm.PackageManager.FEATURE_WIFI;
|
|
import static android.telephony.TelephonyManager.SIM_STATE_READY;
|
|
|
|
import android.app.usage.NetworkStats.Bucket;
|
|
import android.app.usage.NetworkStatsManager;
|
|
import android.content.Context;
|
|
import android.content.pm.PackageManager;
|
|
import android.net.ConnectivityManager;
|
|
import android.net.NetworkTemplate;
|
|
import android.os.RemoteException;
|
|
import android.os.SystemProperties;
|
|
import android.telephony.SubscriptionInfo;
|
|
import android.telephony.SubscriptionManager;
|
|
import android.telephony.TelephonyManager;
|
|
import android.text.BidiFormatter;
|
|
import android.text.format.Formatter;
|
|
import android.text.format.Formatter.BytesResult;
|
|
import android.util.Log;
|
|
|
|
import com.android.settings.datausage.lib.DataUsageLib;
|
|
import com.android.settings.network.ProxySubscriptionManager;
|
|
|
|
import java.util.List;
|
|
|
|
/**
|
|
* Utility methods for data usage classes.
|
|
*/
|
|
public final class DataUsageUtils extends com.android.settingslib.net.DataUsageUtils {
|
|
static final boolean TEST_RADIOS = false;
|
|
static final String TEST_RADIOS_PROP = "test.radios";
|
|
private static final boolean LOGD = false;
|
|
private static final String ETHERNET = "ethernet";
|
|
private static final String TAG = "DataUsageUtils";
|
|
|
|
private DataUsageUtils() {
|
|
}
|
|
|
|
/**
|
|
* Format byte value to readable string using IEC units.
|
|
*/
|
|
public static CharSequence formatDataUsage(Context context, long byteValue) {
|
|
final BytesResult res = Formatter.formatBytes(context.getResources(), byteValue,
|
|
Formatter.FLAG_IEC_UNITS);
|
|
return BidiFormatter.getInstance().unicodeWrap(context.getString(
|
|
com.android.internal.R.string.fileSizeSuffix, res.value, res.units));
|
|
}
|
|
|
|
/**
|
|
* Test if device has an ethernet network connection.
|
|
*/
|
|
public static boolean hasEthernet(Context context) {
|
|
if (DataUsageUtils.TEST_RADIOS) {
|
|
return SystemProperties.get(DataUsageUtils.TEST_RADIOS_PROP).contains(ETHERNET);
|
|
}
|
|
|
|
if (!context.getPackageManager().hasSystemFeature(FEATURE_ETHERNET)) {
|
|
return false;
|
|
}
|
|
|
|
final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
|
|
final NetworkStatsManager networkStatsManager =
|
|
context.getSystemService(NetworkStatsManager.class);
|
|
boolean hasEthernetUsage = false;
|
|
try {
|
|
final Bucket bucket = networkStatsManager.querySummaryForUser(
|
|
ConnectivityManager.TYPE_ETHERNET, telephonyManager.getSubscriberId(),
|
|
0L /* startTime */, System.currentTimeMillis() /* endTime */);
|
|
if (bucket != null) {
|
|
hasEthernetUsage = bucket.getRxBytes() > 0 || bucket.getTxBytes() > 0;
|
|
}
|
|
} catch (RemoteException e) {
|
|
Log.e(TAG, "Exception querying network detail.", e);
|
|
}
|
|
return hasEthernetUsage;
|
|
}
|
|
|
|
/**
|
|
* Returns whether device has mobile data.
|
|
* TODO: This is the opposite to Utils.isWifiOnly(), it should be refactored into 1 method.
|
|
*/
|
|
public static boolean hasMobileData(Context context) {
|
|
final TelephonyManager tele = context.getSystemService(TelephonyManager.class);
|
|
return tele.isDataCapable();
|
|
}
|
|
|
|
/**
|
|
* Test if device has a mobile data radio with SIM in ready state.
|
|
*/
|
|
public static boolean hasReadyMobileRadio(Context context) {
|
|
if (DataUsageUtils.TEST_RADIOS) {
|
|
return SystemProperties.get(DataUsageUtils.TEST_RADIOS_PROP).contains("mobile");
|
|
}
|
|
final List<SubscriptionInfo> subInfoList =
|
|
ProxySubscriptionManager.getInstance(context)
|
|
.getActiveSubscriptionsInfo();
|
|
// No activated Subscriptions
|
|
if (subInfoList == null) {
|
|
if (LOGD) {
|
|
Log.d(TAG, "hasReadyMobileRadio: subInfoList=null");
|
|
}
|
|
return false;
|
|
}
|
|
final TelephonyManager tele = context.getSystemService(TelephonyManager.class);
|
|
// require both supported network and ready SIM
|
|
boolean isReady = true;
|
|
for (SubscriptionInfo subInfo : subInfoList) {
|
|
isReady = isReady & tele.getSimState(subInfo.getSimSlotIndex()) == SIM_STATE_READY;
|
|
if (LOGD) {
|
|
Log.d(TAG, "hasReadyMobileRadio: subInfo=" + subInfo);
|
|
}
|
|
}
|
|
|
|
final boolean isDataCapable = tele.isDataCapable();
|
|
final boolean retVal = isDataCapable && isReady;
|
|
if (LOGD) {
|
|
Log.d(TAG, "hasReadyMobileRadio:"
|
|
+ " telephonManager.isDataCapable()="
|
|
+ isDataCapable
|
|
+ " isReady=" + isReady);
|
|
}
|
|
return retVal;
|
|
}
|
|
|
|
/**
|
|
* Whether device has a Wi-Fi data radio.
|
|
*/
|
|
public static boolean hasWifiRadio(Context context) {
|
|
if (TEST_RADIOS) {
|
|
return SystemProperties.get(TEST_RADIOS_PROP).contains("wifi");
|
|
}
|
|
|
|
final PackageManager packageManager = context.getPackageManager();
|
|
return packageManager != null && packageManager.hasSystemFeature(FEATURE_WIFI);
|
|
}
|
|
|
|
/**
|
|
* Returns the default subscription if available else returns
|
|
* SubscriptionManager#INVALID_SUBSCRIPTION_ID
|
|
*/
|
|
public static int getDefaultSubscriptionId(Context context) {
|
|
// default data subscription is first choice
|
|
final int dataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
|
|
if (SubscriptionManager.isValidSubscriptionId(dataSubId)) {
|
|
return dataSubId;
|
|
}
|
|
|
|
final ProxySubscriptionManager proxySubscriptionMgr =
|
|
ProxySubscriptionManager.getInstance(context);
|
|
|
|
// any active subscription is second choice
|
|
List<SubscriptionInfo> subList = proxySubscriptionMgr.getActiveSubscriptionsInfo();
|
|
if ((subList == null) || (subList.size() <= 0)) {
|
|
// any subscription is third choice
|
|
subList = proxySubscriptionMgr.getAccessibleSubscriptionsInfo();
|
|
}
|
|
if ((subList == null) || (subList.size() <= 0)) {
|
|
return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
|
|
}
|
|
return subList.get(0).getSubscriptionId();
|
|
}
|
|
|
|
/**
|
|
* Returns the default network template based on the availability of mobile data, Wifi. Returns
|
|
* ethernet template if both mobile data and Wifi are not available.
|
|
*/
|
|
public static NetworkTemplate getDefaultTemplate(Context context, int defaultSubId) {
|
|
if (SubscriptionManager.isValidSubscriptionId(defaultSubId) && hasMobileData(context)) {
|
|
return DataUsageLib.getMobileTemplate(context, defaultSubId);
|
|
} else if (hasWifiRadio(context)) {
|
|
return NetworkTemplate.buildTemplateWifi(NetworkTemplate.WIFI_NETWORKID_ALL,
|
|
null /* subscriberId */);
|
|
} else {
|
|
return NetworkTemplate.buildTemplateEthernet();
|
|
}
|
|
}
|
|
|
|
}
|