Merge "Fix NullPointerException issue when user change"

2014-05-09 17:35:27 +00:00
parent 7dd84651a2 bf427a2064
commit 110ddbfea0
1 changed files with 3 additions and 1 deletions
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -841,8 +841,10 @@ public class RunningState {
                            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);