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

Commit f03c6383 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Fix null pointer exception in PhoneWindowManager"

parents d33c1168 db1a0173

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+2 −1
Original line number Diff line number Diff line
@@ -5130,7 +5130,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        }

        final boolean hapticsDisabled = Settings.System.getIntForUser(mContext.getContentResolver(),

                Settings.System.HAPTIC_FEEDBACK_ENABLED, 0, UserHandle.USER_CURRENT) == 0;

        if (!always && (hapticsDisabled || mKeyguardDelegate.isShowingAndNotHidden())) {

        if (!always && (hapticsDisabled || (mKeyguardDelegate != null

                && mKeyguardDelegate.isShowingAndNotHidden()))) {

            return false;

        }

        long[] pattern = null;