diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2014-05-09 17:50:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-09 17:50:30 +0000 |
| commit | f420d2c0d310b6c4f760ebceb6e0dec7bbdb8076 (patch) | |
| tree | 0f4804f92aac5e84699a7fc8b0a36a9d3a2fad36 | |
| parent | 3716d96b26851d870d37b74553c2d6dcd63869e6 (diff) | |
| parent | e4dd48939ddeda2197b722c06f9ec803d8249f0d (diff) | |
| download | packages_apps_Settings-f420d2c0d310b6c4f760ebceb6e0dec7bbdb8076.zip packages_apps_Settings-f420d2c0d310b6c4f760ebceb6e0dec7bbdb8076.tar.gz packages_apps_Settings-f420d2c0d310b6c4f760ebceb6e0dec7bbdb8076.tar.bz2 | |
am e4dd4893: am 14f42ca9: am 110ddbfe: Merge "Fix NullPointerException issue when user change"
* commit 'e4dd48939ddeda2197b722c06f9ec803d8249f0d':
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); |