Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96a8bb63 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Fix crash caused by null owner info Fixes bug 7249550" into jb-mr1-dev

parents 9aacd50c 36c37a02

policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -184,7 +184,7 @@ class KeyguardStatusViewManager { 
                Settings.Secure.LOCK_SCREEN_OWNER_INFO_ENABLED, 1, UserHandle.USER_CURRENT) != 0;

                Settings.Secure.LOCK_SCREEN_OWNER_INFO_ENABLED, 1, UserHandle.USER_CURRENT) != 0;

        String text = Settings.Secure.getStringForUser(res, Settings.Secure.LOCK_SCREEN_OWNER_INFO,

        String text = Settings.Secure.getStringForUser(res, Settings.Secure.LOCK_SCREEN_OWNER_INFO,

                UserHandle.USER_CURRENT);

                UserHandle.USER_CURRENT);

        text = text.trim(); // Remove trailing newlines

        text = text != null ? text.trim() : null; // Remove trailing newlines

        if (ownerInfoEnabled && !TextUtils.isEmpty(text)) {

        if (ownerInfoEnabled && !TextUtils.isEmpty(text)) {

            maybeSetUpperCaseText(mOwnerInfoView, text);

            maybeSetUpperCaseText(mOwnerInfoView, text);

            mOwnerInfoView.setVisibility(View.VISIBLE);

            mOwnerInfoView.setVisibility(View.VISIBLE);