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

Commit 07e01c6e authored by William Leshner's avatar William Leshner Committed by Automerger Merge Worker
Browse files

Merge "Respect "power button instantly locks" setting for dream behavior."... 

Merge "Respect "power button instantly locks" setting for dream behavior." into tm-qpr-dev am: bccceec3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21383587



Change-Id: I12912b40c83a7e4a595bc71f0f2545e43fdc3f9e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 20a2bad6 bccceec3

services/core/java/com/android/server/policy/PhoneWindowManager.java

+7 −2
Original line number Original line Diff line number Diff line
@@ -200,6 +200,7 @@ import com.android.internal.policy.PhoneWindow; 
import com.android.internal.policy.TransitionAnimation;

import com.android.internal.policy.TransitionAnimation;

import com.android.internal.statusbar.IStatusBarService;

import com.android.internal.statusbar.IStatusBarService;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.ArrayUtils;

import com.android.internal.widget.LockPatternUtils;

import com.android.server.ExtconStateObserver;

import com.android.server.ExtconStateObserver;

import com.android.server.ExtconUEventObserver;

import com.android.server.ExtconUEventObserver;

import com.android.server.GestureLauncherService;

import com.android.server.GestureLauncherService;
@@ -413,6 +414,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    AppOpsManager mAppOpsManager;

    AppOpsManager mAppOpsManager;

    PackageManager mPackageManager;

    PackageManager mPackageManager;

    SideFpsEventHandler mSideFpsEventHandler;

    SideFpsEventHandler mSideFpsEventHandler;

    LockPatternUtils mLockPatternUtils;

    private boolean mHasFeatureAuto;

    private boolean mHasFeatureAuto;

    private boolean mHasFeatureWatch;

    private boolean mHasFeatureWatch;

    private boolean mHasFeatureLeanback;

    private boolean mHasFeatureLeanback;
@@ -1064,8 +1066,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        }

        }





        synchronized (mLock) {

        synchronized (mLock) {

            // Lock the device after the dream transition has finished.

            // If the setting to lock instantly on power button press is true, then set the flag to

            mLockAfterAppTransitionFinished = true;

            // lock after the dream transition has finished.

            mLockAfterAppTransitionFinished =

                    mLockPatternUtils.getPowerButtonInstantlyLocks(mCurrentUserId);

        }

        }





        dreamManagerInternal.requestDream();

        dreamManagerInternal.requestDream();
@@ -1938,6 +1942,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        mHasFeatureHdmiCec = mPackageManager.hasSystemFeature(FEATURE_HDMI_CEC);

        mHasFeatureHdmiCec = mPackageManager.hasSystemFeature(FEATURE_HDMI_CEC);

        mAccessibilityShortcutController =

        mAccessibilityShortcutController =

                new AccessibilityShortcutController(mContext, new Handler(), mCurrentUserId);

                new AccessibilityShortcutController(mContext, new Handler(), mCurrentUserId);

        mLockPatternUtils = new LockPatternUtils(mContext);

        mLogger = new MetricsLogger();

        mLogger = new MetricsLogger();





        mScreenOffSleepTokenAcquirer = mActivityTaskManagerInternal

        mScreenOffSleepTokenAcquirer = mActivityTaskManagerInternal