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

Commit b524f4b9 authored by Chris Wren's avatar Chris Wren Committed by Android (Google) Code Review
Browse files

Merge "add some defensive code to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev

parents 2d09880d 91f080c7

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

+29 −26
Original line number Diff line number Diff line
@@ -1305,9 +1305,11 @@ public class KeyguardHostView extends KeyguardViewBase { 
        UserManager mUm = (UserManager) mContext.getSystemService(Context.USER_SERVICE);

        List<UserInfo> users = mUm.getUsers(true);



        if (users.size() > 1) {

        if (users != null && users.size() > 1) {

            View multiUserView = findViewById(R.id.keyguard_user_selector);

            if (multiUserView instanceof KeyguardMultiUserSelectorView) {

                KeyguardMultiUserSelectorView multiUser =

                    (KeyguardMultiUserSelectorView) findViewById(R.id.keyguard_user_selector);

                        (KeyguardMultiUserSelectorView) multiUserView;

                multiUser.setVisibility(View.VISIBLE);

                multiUser.addUsers(mUm.getUsers(true));

                UserSwitcherCallback callback = new UserSwitcherCallback() {
@@ -1338,6 +1340,7 @@ public class KeyguardHostView extends KeyguardViewBase { 
                multiUser.setCallback(callback);

            }

        }

    }



    @Override

    public void cleanUp() {