diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2014-05-09 17:35:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-09 17:35:27 +0000 |
| commit | 110ddbfea0b6ba8702d3f7ba9d00c9f97c908dbb (patch) | |
| tree | 08d713005c3220fe5e53d11d102b2f66cc1b2c1d | |
| parent | 7dd84651a25566c5a2152d935f19a11cebfc58ae (diff) | |
| parent | bf427a2064e76cabc5e50573bcfcc0c954dd0720 (diff) | |
| download | packages_apps_Settings-110ddbfea0b6ba8702d3f7ba9d00c9f97c908dbb.zip packages_apps_Settings-110ddbfea0b6ba8702d3f7ba9d00c9f97c908dbb.tar.gz packages_apps_Settings-110ddbfea0b6ba8702d3f7ba9d00c9f97c908dbb.tar.bz2 | |
Merge "Fix NullPointerException issue when user change"
| -rw-r--r-- | src/com/android/settings/applications/RunningState.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ 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); |