[MS49] Remove NetworkStats hidden Api usages
This includes: 1. Remove unused INetworkStatsService and NetworkStatsHistory. 2. Replace NetworkTemplate usages with builder. 3. Replace TrafficStats references to DataUnit. 4. Reimplement NetworkTemplate#normalize. Test: make RunSettingsRoboTests Bug: 204830222 Change-Id: I8efecda5df403e9ed588daecd169cb3498d213a2
This commit is contained in:
@@ -14,11 +14,9 @@
|
||||
|
||||
package com.android.settings.datausage;
|
||||
|
||||
import static android.app.usage.NetworkStats.Bucket.UID_REMOVED;
|
||||
import static android.app.usage.NetworkStats.Bucket.UID_TETHERING;
|
||||
import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
|
||||
import static android.net.NetworkStatsHistory.FIELD_RX_BYTES;
|
||||
import static android.net.NetworkStatsHistory.FIELD_TX_BYTES;
|
||||
import static android.net.TrafficStats.UID_REMOVED;
|
||||
import static android.net.TrafficStats.UID_TETHERING;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.ActivityManager;
|
||||
@@ -39,7 +37,6 @@ import android.os.UserManager;
|
||||
import android.provider.Settings;
|
||||
import android.telephony.SubscriptionInfo;
|
||||
import android.telephony.SubscriptionManager;
|
||||
import android.util.FeatureFlagUtils;
|
||||
import android.util.Log;
|
||||
import android.util.SparseArray;
|
||||
import android.view.View;
|
||||
@@ -91,7 +88,6 @@ public class DataUsageList extends DataUsageBaseFragment
|
||||
private static final String KEY_APPS_GROUP = "apps_group";
|
||||
private static final String KEY_TEMPLATE = "template";
|
||||
private static final String KEY_APP = "app";
|
||||
private static final String KEY_FIELDS = "fields";
|
||||
|
||||
@VisibleForTesting
|
||||
static final int LOADER_CHART_DATA = 2;
|
||||
@@ -299,7 +295,6 @@ public class DataUsageList extends DataUsageBaseFragment
|
||||
final Bundle args = new Bundle();
|
||||
args.putParcelable(KEY_TEMPLATE, template);
|
||||
args.putParcelable(KEY_APP, null);
|
||||
args.putInt(KEY_FIELDS, FIELD_RX_BYTES | FIELD_TX_BYTES);
|
||||
return args;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user