diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2014-05-09 17:45:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-09 17:45:42 +0000 |
| commit | e4dd48939ddeda2197b722c06f9ec803d8249f0d (patch) | |
| tree | faf1fc07c3e1a96ed2141edb742e1e9ac2ec4f95 /src/com | |
| parent | 3cfb6885b4075a3887cb0acb437704394fc9e90e (diff) | |
| parent | 14f42ca9f46d2dafaadff2b0ccef645d66679bc7 (diff) | |
| download | packages_apps_Settings-e4dd48939ddeda2197b722c06f9ec803d8249f0d.tar.gz packages_apps_Settings-e4dd48939ddeda2197b722c06f9ec803d8249f0d.tar.bz2 packages_apps_Settings-e4dd48939ddeda2197b722c06f9ec803d8249f0d.zip | |
am 14f42ca9: am 110ddbfe: Merge "Fix NullPointerException issue when user change"
* commit '14f42ca9f46d2dafaadff2b0ccef645d66679bc7':
Fix NullPointerException issue when user change
Diffstat (limited to 'src/com')
| -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 94ab11dc6..632b2024a 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); |