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

Commit 6e1a98dd authored by Amith Yamasani's avatar Amith Yamasani Committed by android-build-merger
Browse files

Merge "Screen-pinning unpin security fails for secondary user. DO NOT MERGE" into oc-mr1-dev 

am: eb7b0393

Change-Id: Icc808587e11431ba869718732909b65203eca010
parents e154c72e eb7b0393

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+3 −2
Original line number Diff line number Diff line
@@ -4596,9 +4596,10 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D 
                        }

                        mLockTaskNotify.show(false);

                        try {

                            boolean shouldLockKeyguard = Settings.Secure.getInt(

                            boolean shouldLockKeyguard = Settings.Secure.getIntForUser(

                                    mService.mContext.getContentResolver(),

                                    Settings.Secure.LOCK_TO_APP_EXIT_LOCKED) != 0;

                                    Settings.Secure.LOCK_TO_APP_EXIT_LOCKED,

                                    UserHandle.USER_CURRENT) != 0;

                            if (mLockTaskModeState == LOCK_TASK_MODE_PINNED && shouldLockKeyguard) {

                                mWindowManager.lockNow(null);

                                mWindowManager.dismissKeyguard(null /* callback */);