commit f315e2e6f046c951f01ababbd32eee3fb9d4797c
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 21 16:53:25 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 21 16:53:26 2016 +0000
tree 0015046c33a6393b055eb748fe2ab10deb3bddbd
parent afea1cae2575d904a442274d3dc3a4da04c3fa18
parent 2d85beec1ec8ead2d78fa6bc4819dcac1d91a0b4

Merge "Import translations. DO NOT MERGE" into nyc-dev

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

diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index e0dc389..0f67be9 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -188,13 +188,19 @@
                 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);