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

Merge "Do not enter resumeTopActivity recursively." into klp-dev

Browse Source
This commit is contained in:
Craig Mautner
2013-09-09 21:55:20 +00:00
committed by Android (Google) Code Review
parent 4d0b9abae7 e5273b422e
commit 16c3220734
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/am/ActivityStack.java
View File

@@ -1110,8 +1110,10 @@ final class ActivityStack {
case PAUSED: case PAUSED:
// This case created for transitioning activities from // This case created for transitioning activities from
// translucent to opaque {@link Activity#convertToOpaque}. // translucent to opaque {@link Activity#convertToOpaque}.
mStackSupervisor.mStoppingActivities.remove(r); if (!mStackSupervisor.mStoppingActivities.contains(r)) {
stopActivityLocked(r); mStackSupervisor.mStoppingActivities.add(r);
}
mStackSupervisor.scheduleIdleLocked();
break; break;
default: default: