Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9664c1a5 authored by Rajeev Kumar's avatar Rajeev Kumar
Browse files

Refactor few public static methods. 

Move public static methods from DataUsageSummary to DataUsageBase.

Bug: 62349208
Test: make RunSettingsRoboTests -j40
Change-Id: I632f75f4c4f370fb225a9787267043fec20994e5
parent 6ce42208

src/com/android/settings/applications/InstalledAppDetails.java

+3 −4
Original line number Diff line number Diff line 
/**

/*

 * Copyright (C) 2007 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -67,7 +67,6 @@ import android.view.MenuItem; 
import android.view.View;

import android.webkit.IWebViewUpdateService;

import android.widget.Button;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.os.BatterySipper;

import com.android.internal.os.BatteryStatsHelper;
@@ -86,6 +85,7 @@ import com.android.settings.datausage.AppDataUsage; 
import com.android.settings.datausage.DataUsageList;

import com.android.settings.datausage.DataUsageSummary;

import com.android.settings.development.DevelopmentSettingsEnabler;

import com.android.settings.datausage.DataUsageUtils;

import com.android.settings.fuelgauge.AdvancedPowerUsageDetail;

import com.android.settings.fuelgauge.BatteryEntry;

import com.android.settings.fuelgauge.BatteryStatsHelperLoader;
@@ -105,7 +105,6 @@ import com.android.settingslib.applications.StorageStatsSource; 
import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;

import com.android.settingslib.net.ChartData;

import com.android.settingslib.net.ChartDataLoader;



import java.lang.ref.WeakReference;

import java.util.ArrayList;

import java.util.HashSet;
@@ -1303,7 +1302,7 @@ public class InstalledAppDetails extends AppInfoBase 
        if (DataUsageList.hasReadyMobileRadio(context)) {

            return NetworkTemplate.buildTemplateMobileWildcard();

        }

        if (DataUsageSummary.hasWifiRadio(context)) {

        if (DataUsageUtils.hasWifiRadio(context)) {

            return NetworkTemplate.buildTemplateWifiWildcard();

        }

        return NetworkTemplate.buildTemplateEthernet();

src/com/android/settings/datausage/AppDataUsage.java

+4 −5
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 


package com.android.settings.datausage;



import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;



import android.app.Activity;

import android.app.LoaderManager;

import android.content.Context;
@@ -39,7 +41,6 @@ import android.util.IconDrawableFactory; 
import android.util.Log;

import android.view.View;

import android.widget.AdapterView;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.R;

import com.android.settings.applications.AppInfoBase;
@@ -52,8 +53,6 @@ import com.android.settingslib.net.ChartDataLoader; 
import com.android.settingslib.net.UidDetail;

import com.android.settingslib.net.UidDetailProvider;



import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;



public class AppDataUsage extends DataUsageBase implements Preference.OnPreferenceChangeListener,

        DataSaverBackend.Listener {
@@ -117,8 +116,8 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen 
                : null;

        if (mTemplate == null) {

            Context context = getContext();

            mTemplate = DataUsageSummary.getDefaultTemplate(context,

                    DataUsageSummary.getDefaultSubscriptionId(context));

            mTemplate = DataUsageUtils.getDefaultTemplate(context,

                    DataUsageUtils.getDefaultSubscriptionId(context));

        }

        if (mAppItem == null) {

            int uid = (args != null) ? args.getInt(AppInfoBase.ARG_PACKAGE_UID, -1)

src/com/android/settings/datausage/DataUsageBase.java

+2 −4
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ 


package com.android.settings.datausage;



import com.android.settings.SettingsPreferenceFragment;

import com.android.settingslib.NetworkPolicyEditor;



import android.content.Context;

import android.net.INetworkStatsService;

import android.net.NetworkPolicy;
@@ -29,9 +26,10 @@ import android.os.UserManager; 
import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.util.Log;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settingslib.NetworkPolicyEditor;



public abstract class DataUsageBase extends SettingsPreferenceFragment {



    private static final String TAG = "DataUsageBase";



    protected final TemplatePreference.NetworkServices services =

src/com/android/settings/datausage/DataUsageList.java

+10 −14
Original line number Diff line number Diff line
@@ -14,6 +14,12 @@ 


package com.android.settings.datausage;



import static android.net.ConnectivityManager.TYPE_MOBILE;

import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;

import static android.net.TrafficStats.UID_REMOVED;

import static android.net.TrafficStats.UID_TETHERING;

import static android.telephony.TelephonyManager.SIM_STATE_READY;



import android.app.ActivityManager;

import android.app.LoaderManager.LoaderCallbacks;

import android.content.Context;
@@ -46,7 +52,6 @@ import android.view.View; 
import android.widget.AdapterView;

import android.widget.AdapterView.OnItemSelectedListener;

import android.widget.Spinner;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.R;

import com.android.settings.datausage.CycleAdapter.SpinnerInterface;
@@ -56,19 +61,10 @@ import com.android.settingslib.net.ChartData; 
import com.android.settingslib.net.ChartDataLoader;

import com.android.settingslib.net.SummaryForAllUidLoader;

import com.android.settingslib.net.UidDetailProvider;



import java.util.ArrayList;

import java.util.Collections;

import java.util.List;



import static android.net.ConnectivityManager.TYPE_MOBILE;

import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;

import static android.net.TrafficStats.UID_REMOVED;

import static android.net.TrafficStats.UID_TETHERING;

import static android.telephony.TelephonyManager.SIM_STATE_READY;

import static com.android.settings.datausage.DataUsageSummary.TEST_RADIOS;

import static com.android.settings.datausage.DataUsageSummary.TEST_RADIOS_PROP;



/**

 * Panel showing data usage history across various networks, including options

 * to inspect based on usage cycle and control through {@link NetworkPolicy}.
@@ -442,8 +438,8 @@ public class DataUsageList extends DataUsageBase { 
     * Test if device has a mobile data radio with SIM in ready state.

     */

    public static boolean hasReadyMobileRadio(Context context) {

        if (TEST_RADIOS) {

            return SystemProperties.get(TEST_RADIOS_PROP).contains("mobile");

        if (DataUsageUtils.TEST_RADIOS) {

            return SystemProperties.get(DataUsageUtils.TEST_RADIOS_PROP).contains("mobile");

        }



        final ConnectivityManager conn = ConnectivityManager.from(context);
@@ -476,8 +472,8 @@ public class DataUsageList extends DataUsageBase { 
     * TODO: consider adding to TelephonyManager or SubscriptionManager.

     */

    public static boolean hasReadyMobileRadio(Context context, int subId) {

        if (TEST_RADIOS) {

            return SystemProperties.get(TEST_RADIOS_PROP).contains("mobile");

        if (DataUsageUtils.TEST_RADIOS) {

            return SystemProperties.get(DataUsageUtils.TEST_RADIOS_PROP).contains("mobile");

        }



        final ConnectivityManager conn = ConnectivityManager.from(context);

src/com/android/settings/datausage/DataUsageMeteredSettings.java

+2 −6
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ package com.android.settings.datausage; 


import static android.net.wifi.WifiInfo.removeDoubleQuotes;



import static com.android.settings.datausage.DataUsageSummary.hasWifiRadio;



import android.app.backup.BackupManager;

import android.content.Context;

import android.content.res.Resources;
@@ -29,7 +27,6 @@ import android.support.v7.preference.DropDownPreference; 
import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceCategory;

import android.text.TextUtils;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;
@@ -37,7 +34,6 @@ import com.android.settings.search.BaseSearchIndexProvider; 
import com.android.settings.search.Indexable;

import com.android.settings.search.SearchIndexableRaw;

import com.android.settingslib.NetworkPolicyEditor;



import java.util.ArrayList;

import java.util.List;
@@ -83,7 +79,7 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment impleme 
        getPreferenceScreen().removePreference(mMobileCategory);



        mWifiCategory.removeAll();

        if (hasWifiRadio(context) && mWifiManager.isWifiEnabled()) {

        if (DataUsageUtils.hasWifiRadio(context) && mWifiManager.isWifiEnabled()) {

            for (WifiConfiguration config : mWifiManager.getConfiguredNetworks()) {

                final Preference pref = new MeteredPreference(getPrefContext(), config);

                if (!TextUtils.isEmpty(pref.getTitle())) {
@@ -162,7 +158,7 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment impleme 


                final WifiManager wifiManager =

                        (WifiManager) context.getSystemService(Context.WIFI_SERVICE);

                if (hasWifiRadio(context) && wifiManager.isWifiEnabled()) {

                if (DataUsageUtils.hasWifiRadio(context) && wifiManager.isWifiEnabled()) {

                    for (WifiConfiguration config : wifiManager.getConfiguredNetworks()) {

                        if (config.SSID != null) {

                            final String networkId = config.SSID;