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

Commit 82b517be authored by Jim Miller's avatar Jim Miller
Browse files

Fix potential null pointer exeption in keyguard 

The code was adding default widgets before setting mViewStateManager, which means the
callback from the transport control might access mViewStateManager before it's set.

Change-Id: I985a3c8062d0660519cb4a4c8c1b42c7c90f4ac7
parent c8f7c5eb

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

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

        mAppWidgetContainer.setMinScale(0.5f);



        mViewStateManager = new KeyguardViewStateManager();



        addDefaultWidgets();

        addWidgetsFromSettings();



        mViewStateManager = new KeyguardViewStateManager();

        SlidingChallengeLayout slider =

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

        if (slider != null) {