diff options
| author | Craig Mautner <cmautner@google.com> | 2013-09-27 00:46:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-27 00:46:53 +0000 |
| commit | 231bd6c514f15cb0b42a04d4fc7fc9631c743686 (patch) | |
| tree | 7f23b5cbf92a5f64ca441bd0f360aa5a579b7b6f /services/java/com/android/server/am/ActivityStack.java | |
| parent | 8fb6d97ad5671b4abc1940d8bc56cf7448e45c35 (diff) | |
| parent | 0756632aa056cc873943f7f19c7501ce79608394 (diff) | |
| download | frameworks_base-231bd6c514f15cb0b42a04d4fc7fc9631c743686.zip frameworks_base-231bd6c514f15cb0b42a04d4fc7fc9631c743686.tar.gz frameworks_base-231bd6c514f15cb0b42a04d4fc7fc9631c743686.tar.bz2 | |
Merge "Dismiss keyguard when resuming visible activities" into klp-dev
Diffstat (limited to 'services/java/com/android/server/am/ActivityStack.java')
| -rw-r--r-- | services/java/com/android/server/am/ActivityStack.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index a88c3cc..18ff819 100644 --- a/services/java/com/android/server/am/ActivityStack.java +++ b/services/java/com/android/server/am/ActivityStack.java @@ -937,6 +937,10 @@ final class ActivityStack { next.idle = false; next.results = null; next.newIntents = null; + if (next.nowVisible) { + // We won't get a call to reportActivityVisibleLocked() so dismiss lockscreen now. + mStackSupervisor.dismissKeyguard(); + } // schedule an idle timeout in case the app doesn't do it for us. mStackSupervisor.scheduleIdleTimeoutLocked(next); |