Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e14d0c21: Merge "Ensure that activities behind keyguard are paused." into klp-dev

Browse Source 
* commit 'e14d0c211fb669f88c284af85c942135e834e498':
  Ensure that activities behind keyguard are paused.
This commit is contained in:
Craig Mautner
2013-09-23 18:59:05 -07:00
committed by Android Git Automerger
parent 10914a23f7 e14d0c211f
commit c96218a057
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -1246,8 +1246,9 @@ public final class ActivityStackSupervisor {
mService.doPendingActivityLaunchesLocked(false);
err = startActivityUncheckedLocked(r, sourceRecord, startFlags, true, options);
if (stack.mPausingActivity == null) {
// Someone asked to have the keyguard dismissed on the next
if (allPausedActivitiesComplete()) {
// If someone asked to have the keyguard dismissed on the next
// activity start, but we are not actually doing an activity
// switch... just dismiss the keyguard now, because we
// probably want to see whatever is behind it.
@@ -2150,9 +2151,6 @@ public final class ActivityStackSupervisor {
for (int stackNdx = mStacks.size() - 1; stackNdx >= 0; --stackNdx) {
final ActivityStack stack = mStacks.get(stackNdx);
stack.awakeFromSleepingLocked();
if (isFrontStack(stack)) {
resumeTopActivitiesLocked();
}
}
mGoingToSleepActivities.clear();
}