commit e069779dea07c77fb858a403c42020e39b3d9c60
author Jason Monk <jmonk@google.com> Mon Aug 04 16:28:09 2014 -0400
committer Jason Monk <jmonk@google.com> Mon Aug 04 23:50:06 2014 +0000
tree 44a138fece07d0fb87f1f61e8e7e6d00df87d47f
parent 2265c8f70088b88b34ee9e315f7ae5519de1cdba

When exiting lock task require authentication

When exiting lock task with screen locking on make sure to notify
that the credentials need to be entered again.

Bug: 16496374
Change-Id: I891a8a8a04a67aa70eba8ea78bd585ad0dd17808

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

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 52ace54..b4e66c1 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -97,6 +97,7 @@
 import com.android.internal.app.IVoiceInteractor;
 import com.android.internal.os.TransferPipe;
 import com.android.internal.statusbar.IStatusBarService;
+import com.android.internal.widget.LockPatternUtils;
 import com.android.server.LocalServices;
 import com.android.server.am.ActivityStack.ActivityState;
 import com.android.server.wm.WindowManagerService;
@@ -3327,6 +3328,8 @@
                             if (!mLockTaskIsLocked && shouldLockKeyguard) {
                                 mWindowManager.lockNow(null);
                                 mWindowManager.dismissKeyguard();
+                                new LockPatternUtils(mService.mContext)
+                                        .requireCredentialEntry(UserHandle.USER_ALL);
                             }
                         } catch (SettingNotFoundException e) {
                             // No setting, don't lock.