From 40234f6fe2f683840df3f3dd952bf4b4c8e3f67d Mon Sep 17 00:00:00 2001 From: tiansiming Date: Tue, 7 Mar 2017 10:46:13 +0800 Subject: [PATCH] Optimize code on get UidDetail in AppDataUsage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The class UidDetailProvider providers details about a specific UID， we can directly apply it here. Optimize: https://code.google.com/p/android/issues/detail?id=237810 Test: for case TrafficStats.UID_REMOVED 1.add an new User 2.generate some data traffic under the new user 3.switch to the phone owner 4.delete the User added just now 5.go to Data usage and open the item "Removed apps and users" for case TrafficStats.UID_TETHERING 1.open tethering and generate some data traffic 2.go to Data usage and open the item "Tethering & portable hotspot" Change-Id: I05aa522728b296d6c06580adf809f274491cdcea Signed-off-by: tiansiming --- .../settings/datausage/AppDataUsage.java | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java index 45fdc1d8170..6400b5349a8 100644 --- a/src/com/android/settings/datausage/AppDataUsage.java +++ b/src/com/android/settings/datausage/AppDataUsage.java @@ -49,6 +49,7 @@ import com.android.settingslib.AppItem; import com.android.settingslib.Utils; import com.android.settingslib.net.ChartData; import com.android.settingslib.net.ChartDataLoader; +import com.android.settingslib.net.UidDetail; import com.android.settingslib.net.UidDetailProvider; import java.util.concurrent.BlockingQueue; @@ -207,19 +208,12 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen removePreference(KEY_APP_LIST); } } else { - if (mAppItem.key == TrafficStats.UID_REMOVED) { - mLabel = getContext().getString(R.string.data_usage_uninstalled_apps_users); - } else if (mAppItem.key == TrafficStats.UID_TETHERING) { - mLabel = getContext().getString(R.string.tether_settings_title_all); - } else { - 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(); - } + final Context context = getActivity(); + UidDetail uidDetail = new UidDetailProvider(context).getUidDetail(mAppItem.key, true); + mIcon = uidDetail.icon; + mLabel = uidDetail.label; + mPackageName = context.getPackageName(); + removePreference(KEY_UNRESTRICTED_DATA); removePreference(KEY_APP_SETTINGS); removePreference(KEY_RESTRICT_BACKGROUND);