From: Zoltan Szatmary-Ban <szatmz@google.com>
Date: Tue, 21 Jun 2016 11:57:30 +0000 (+0100)
Subject: Fix non-app non-user preferences in Settings > Data usage
X-Git-Tag: android-x86-7.1-r1~456^2~16
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=afea1cae2575d904a442274d3dc3a4da04c3fa18;p=android-x86%2Fpackages-apps-Settings.git

Fix non-app non-user preferences in Settings > Data usage

Bug:29466113
Change-Id: Ib7a6d477146a856c0cb9c49143ffbf4fb99e38ed
---

diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index e0dc389210..0f67be9ca4 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -188,13 +188,19 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
                 removePreference(KEY_APP_LIST);
             }
         } 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();
+            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();
+            }
             removePreference(KEY_UNRESTRICTED_DATA);
             removePreference(KEY_APP_SETTINGS);
             removePreference(KEY_RESTRICT_BACKGROUND);