Merge "Correct keyguard occluding condition for wakeup" into main

package com.android.server.wm;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_DREAM;

import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;

import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_APPEARING;

            final boolean lastKeyguardGoingAway = mKeyguardGoingAway;

            final ActivityRecord lastDismissKeyguardActivity = mDismissingKeyguardActivity;

            final ActivityRecord lastTurnScreenOnActivity = mTopTurnScreenOnActivity;

            mRequestDismissKeyguard = false;

            mOccluded = false;

            mDismissingKeyguardActivity = null;

            mTopTurnScreenOnActivity = null;

            boolean occludedByActivity = false;

            final Task task = getRootTaskForControllingOccluding(display);

            final ActivityRecord top = task != null ? task.getTopNonFinishingActivity() : null;

            if (top != null) {

            if (mTopTurnScreenOnActivity != null

                    && !mService.mWindowManager.mPowerManager.isInteractive()

                    && (mRequestDismissKeyguard || occludedByActivity)) {

                    && (mRequestDismissKeyguard || mOccluded)) {

                controller.mTaskSupervisor.wakeUp("handleTurnScreenOn");

                mTopTurnScreenOnActivity.setCurrentLaunchCanTurnScreenOn(false);

            }