diff options
| author | Jim Miller <jaggies@google.com> | 2012-09-27 17:35:18 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2012-09-27 17:35:18 -0700 |
| commit | 36c37a021efb182b7369e28603740a29185f285a (patch) | |
| tree | 51a248e21c6017ae5f4e4b628f6d816cdd28618d /policy | |
| parent | e00d33cf05a111c9be605d3d59db911cd983fcb9 (diff) | |
| download | frameworks_base-36c37a021efb182b7369e28603740a29185f285a.zip frameworks_base-36c37a021efb182b7369e28603740a29185f285a.tar.gz frameworks_base-36c37a021efb182b7369e28603740a29185f285a.tar.bz2 | |
Fix crash caused by null owner info
Fixes bug 7249550
Change-Id: I35a46bf03e9d11311e2f7d7d55e25bbc93687f83
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java index 220feb3..701017d 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java @@ -184,7 +184,7 @@ class KeyguardStatusViewManager { Settings.Secure.LOCK_SCREEN_OWNER_INFO_ENABLED, 1, UserHandle.USER_CURRENT) != 0; String text = Settings.Secure.getStringForUser(res, Settings.Secure.LOCK_SCREEN_OWNER_INFO, UserHandle.USER_CURRENT); - text = text.trim(); // Remove trailing newlines + text = text != null ? text.trim() : null; // Remove trailing newlines if (ownerInfoEnabled && !TextUtils.isEmpty(text)) { maybeSetUpperCaseText(mOwnerInfoView, text); mOwnerInfoView.setVisibility(View.VISIBLE); |