drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When exiting lock task require authentication

Browse Source 
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
This commit is contained in:
Jason Monk
2014-08-04 16:28:09 -04:00
parent 2265c8f700
commit e069779dea
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@ -97,6 +97,7 @@ import com.android.internal.app.HeavyWeightSwitcherActivity;
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 @@ public final class ActivityStackSupervisor implements DisplayListener {
if (!mLockTaskIsLocked && shouldLockKeyguard) {
mWindowManager.lockNow(null);
mWindowManager.dismissKeyguard();
new LockPatternUtils(mService.mContext)
.requireCredentialEntry(UserHandle.USER_ALL);
}
} catch (SettingNotFoundException e) {
// No setting, don't lock.