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

Commit ec6da667 authored by Robin Lee's avatar Robin Lee Committed by Gerrit Code Review
Browse files

Merge "Optimize code on get UidDetail in AppDataUsage"

parents f80b4451 40234f6f

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

+7 −13
Original line number Original line Diff line number Diff line
@@ -49,6 +49,7 @@ import com.android.settingslib.AppItem; 
import com.android.settingslib.Utils;

import com.android.settingslib.Utils;

import com.android.settingslib.net.ChartData;

import com.android.settingslib.net.ChartData;

import com.android.settingslib.net.ChartDataLoader;

import com.android.settingslib.net.ChartDataLoader;

import com.android.settingslib.net.UidDetail;

import com.android.settingslib.net.UidDetailProvider;

import com.android.settingslib.net.UidDetailProvider;





import java.util.concurrent.BlockingQueue;

import java.util.concurrent.BlockingQueue;
@@ -207,19 +208,12 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen 
                removePreference(KEY_APP_LIST);

                removePreference(KEY_APP_LIST);

            }

            }

        } else {

        } else {

            if (mAppItem.key == TrafficStats.UID_REMOVED) {

            final Context context = getActivity();

                mLabel = getContext().getString(R.string.data_usage_uninstalled_apps_users);

            UidDetail uidDetail = new UidDetailProvider(context).getUidDetail(mAppItem.key, true);

            } else if (mAppItem.key == TrafficStats.UID_TETHERING) {

            mIcon = uidDetail.icon;

                mLabel = getContext().getString(R.string.tether_settings_title_all);

            mLabel = uidDetail.label;

            } else {

            mPackageName = context.getPackageName();

                final int userId = UidDetailProvider.getUserIdForKey(mAppItem.key);



                final UserManager um = UserManager.get(getActivity());

                final UserInfo info = um.getUserInfo(userId);

                final PackageManager pm = getPackageManager();

                mIcon = Utils.getUserIcon(getActivity(), um, info);

                mLabel = Utils.getUserLabel(getActivity(), info);

                mPackageName = getActivity().getPackageName();

            }

            removePreference(KEY_UNRESTRICTED_DATA);

            removePreference(KEY_UNRESTRICTED_DATA);

            removePreference(KEY_APP_SETTINGS);

            removePreference(KEY_APP_SETTINGS);

            removePreference(KEY_RESTRICT_BACKGROUND);

            removePreference(KEY_RESTRICT_BACKGROUND);