commit 14f42ca9f46d2dafaadff2b0ccef645d66679bc7
author Jeff Sharkey <jsharkey@android.com> Fri May 09 17:41:27 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 09 17:41:27 2014 +0000
tree d053b49d4da699ec70889ff2daca730f19846405
parent d6b0b1721a684be1805025908c4733a6b02794a4
parent 110ddbfea0b6ba8702d3f7ba9d00c9f97c908dbb

am 110ddbfe: Merge "Fix NullPointerException issue when user change"

* commit '110ddbfea0b6ba8702d3f7ba9d00c9f97c908dbb':
  Fix NullPointerException issue when user change

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

diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index 94ab11d..632b202 100644
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -841,8 +841,10 @@
                             info, context.getResources());
                 }
                 String name = info != null ? info.name : null;
-                if (name == null) {
+                if (name == null && info != null) {
                     name = Integer.toString(info.id);
+                } else if (info == null) {
+                    name = context.getString(R.string.unknown);
                 }
                 userItem.mUser.mLabel = context.getResources().getString(
                         R.string.running_process_item_user_label, name);