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

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

Merge "Fix potential null pointer exeption in keyguard" into jb-mr1-lockscreen-dev

parents 8ea7cbe6 82b517be

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

+2 −1
Original line number Diff line number Diff line
@@ -153,11 +153,12 @@ public class KeyguardHostView extends KeyguardViewBase { 
        mAppWidgetContainer.setCallbacks(mWidgetCallbacks);

        mAppWidgetContainer.setMinScale(0.5f);



        mViewStateManager = new KeyguardViewStateManager();



        addDefaultWidgets();

        addWidgetsFromSettings();

        mSwitchPageRunnable.run();



        mViewStateManager = new KeyguardViewStateManager();

        SlidingChallengeLayout slider =

                (SlidingChallengeLayout) findViewById(R.id.sliding_layout);

        if (slider != null) {