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

Commit 021fa35d authored by Jason Monk's avatar Jason Monk Committed by Android Git Automerger
Browse files

am 06bbb1e7: am 01f4253b: am 7143b71c: Merge "Make the \'locked\' lock task... 

am 06bbb1e7: am 01f4253b: am 7143b71c: Merge "Make the \'locked\' lock task not lock keyguard on exit" into lmp-dev

* commit '06bbb1e71e17151b1de7827c9c59c8a14f00d87c':
  Make the 'locked' lock task not lock keyguard on exit
parents a9f68c9a a979c557

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -3284,10 +3284,11 @@ public final class ActivityStackSupervisor implements DisplayListener { 
                            mLockTaskNotify = new LockTaskNotify(mService.mContext);

                            mLockTaskNotify = new LockTaskNotify(mService.mContext);

                        }

                        }

                        mLockTaskNotify.show(true);

                        mLockTaskNotify.show(true);

                        mLockTaskIsLocked = msg.arg2 == 0;

                        if (getStatusBarService() != null) {

                        if (getStatusBarService() != null) {

                            int flags =

                            int flags =

                                    StatusBarManager.DISABLE_MASK ^ StatusBarManager.DISABLE_BACK;

                                    StatusBarManager.DISABLE_MASK ^ StatusBarManager.DISABLE_BACK;

                            if (msg.arg2 != 0) {

                            if (!mLockTaskIsLocked) {

                                flags ^= StatusBarManager.DISABLE_HOME

                                flags ^= StatusBarManager.DISABLE_HOME

                                        | StatusBarManager.DISABLE_RECENT;

                                        | StatusBarManager.DISABLE_RECENT;

                            }

                            }
@@ -3323,7 +3324,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
                            boolean shouldLockKeyguard = Settings.System.getInt(

                            boolean shouldLockKeyguard = Settings.System.getInt(

                                    mService.mContext.getContentResolver(),

                                    mService.mContext.getContentResolver(),

                                    Settings.System.LOCK_TO_APP_EXIT_LOCKED) != 0;

                                    Settings.System.LOCK_TO_APP_EXIT_LOCKED) != 0;

                            if (shouldLockKeyguard) {

                            if (!mLockTaskIsLocked && shouldLockKeyguard) {

                                mWindowManager.lockNow(null);

                                mWindowManager.lockNow(null);

                                mWindowManager.dismissKeyguard();

                                mWindowManager.dismissKeyguard();

                            }

                            }