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

* commit '110ddbfea0b6ba8702d3f7ba9d00c9f97c908dbb':
  Fix NullPointerException issue when user change
This commit is contained in:
Jeff Sharkey
2014-05-09 17:41:27 +00:00
committed by Android Git Automerger

View File

@@ -841,8 +841,10 @@ public class RunningState {
info, context.getResources()); info, context.getResources());
} }
String name = info != null ? info.name : null; String name = info != null ? info.name : null;
if (name == null) { if (name == null && info != null) {
name = Integer.toString(info.id); name = Integer.toString(info.id);
} else if (info == null) {
name = context.getString(R.string.unknown);
} }
userItem.mUser.mLabel = context.getResources().getString( userItem.mUser.mLabel = context.getResources().getString(
R.string.running_process_item_user_label, name); R.string.running_process_item_user_label, name);