fd41cce94b
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
80 lines
3.0 KiB
Java
80 lines
3.0 KiB
Java
/*
|
|
* Copyright (C) 2020 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.lib;
|
|
|
|
import android.content.Context;
|
|
import android.net.NetworkTemplate;
|
|
import android.telephony.SubscriptionInfo;
|
|
import android.telephony.SubscriptionManager;
|
|
import android.telephony.TelephonyManager;
|
|
import android.util.Log;
|
|
|
|
import com.android.internal.util.ArrayUtils;
|
|
|
|
import java.util.List;
|
|
|
|
/**
|
|
* Lib class for data usage
|
|
*/
|
|
public class DataUsageLib {
|
|
private static final String TAG = "DataUsageLib";
|
|
|
|
/**
|
|
* Return mobile NetworkTemplate based on {@code subId}
|
|
*/
|
|
public static NetworkTemplate getMobileTemplate(Context context, int subId) {
|
|
final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
|
|
final int mobileDefaultSubId = telephonyManager.getSubscriptionId();
|
|
|
|
final SubscriptionManager subscriptionManager =
|
|
context.getSystemService(SubscriptionManager.class);
|
|
final List<SubscriptionInfo> subInfoList =
|
|
subscriptionManager.getAvailableSubscriptionInfoList();
|
|
if (subInfoList == null) {
|
|
Log.i(TAG, "Subscription is not inited: " + subId);
|
|
return getMobileTemplateForSubId(telephonyManager, mobileDefaultSubId);
|
|
}
|
|
|
|
for (SubscriptionInfo subInfo : subInfoList) {
|
|
if ((subInfo != null) && (subInfo.getSubscriptionId() == subId)) {
|
|
return getNormalizedMobileTemplate(telephonyManager, subId);
|
|
}
|
|
}
|
|
Log.i(TAG, "Subscription is not active: " + subId);
|
|
return getMobileTemplateForSubId(telephonyManager, mobileDefaultSubId);
|
|
}
|
|
|
|
private static NetworkTemplate getNormalizedMobileTemplate(
|
|
TelephonyManager telephonyManager, int subId) {
|
|
final NetworkTemplate mobileTemplate = getMobileTemplateForSubId(telephonyManager, subId);
|
|
final String[] mergedSubscriberIds = telephonyManager
|
|
.createForSubscriptionId(subId).getMergedImsisFromGroup();
|
|
if (ArrayUtils.isEmpty(mergedSubscriberIds)) {
|
|
Log.i(TAG, "mergedSubscriberIds is null.");
|
|
return mobileTemplate;
|
|
}
|
|
|
|
return NetworkTemplate.normalize(mobileTemplate, mergedSubscriberIds);
|
|
}
|
|
|
|
private static NetworkTemplate getMobileTemplateForSubId(
|
|
TelephonyManager telephonyManager, int subId) {
|
|
return NetworkTemplate.buildTemplateMobileAll(
|
|
telephonyManager.getSubscriberId(subId));
|
|
}
|
|
}
|