Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I12912b40c83a7e4a595bc71f0f2545e43fdc3f9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
William Leshner
2023-03-08 18:19:12 +00:00
committed by Automerger Merge Worker
parent 20a2bad6db bccceec33c
commit 07e01c6e5c
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -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