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

am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev

Browse Source 
* commit '0fa45d93f7265c130d5dc49a51130ed74db5cec9':
  Remove PendingActivityLaunches based on stack.
This commit is contained in:
Craig Mautner
2014-07-28 23:28:59 +00:00
committed by Android Git Automerger
parent 52baf3d096 0fa45d93f7
commit 09875ec729
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -2692,7 +2692,6 @@ final class ActivityStack {
// down to the max limit while they are still waiting to finish. // down to the max limit while they are still waiting to finish.
mStackSupervisor.mFinishingActivities.remove(r); mStackSupervisor.mFinishingActivities.remove(r);
mStackSupervisor.mWaitingVisibleActivities.remove(r); mStackSupervisor.mWaitingVisibleActivities.remove(r);
mStackSupervisor.removePendingActivityLaunchesLocked(r);
// Remove any pending results. // Remove any pending results.
if (r.finishing && r.pendingResults != null) { if (r.finishing && r.pendingResults != null) {

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

@@ -1859,10 +1859,10 @@ public final class ActivityStackSupervisor implements DisplayListener {
} }
} }
void removePendingActivityLaunchesLocked(ActivityRecord r) { void removePendingActivityLaunchesLocked(ActivityStack stack) {
for (int palNdx = mPendingActivityLaunches.size() - 1; palNdx >= 0; --palNdx) { for (int palNdx = mPendingActivityLaunches.size() - 1; palNdx >= 0; --palNdx) {
PendingActivityLaunch pal = mPendingActivityLaunches.get(palNdx); PendingActivityLaunch pal = mPendingActivityLaunches.get(palNdx);
if (pal.r == r) { if (pal.stack == stack) {
mPendingActivityLaunches.remove(palNdx); mPendingActivityLaunches.remove(palNdx);
} }
} }
@@ -3097,6 +3097,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
long origId = Binder.clearCallingIdentity(); long origId = Binder.clearCallingIdentity();
try { try {
mStack.finishAllActivitiesLocked(false); mStack.finishAllActivitiesLocked(false);
removePendingActivityLaunchesLocked(mStack);
} finally { } finally {
Binder.restoreCallingIdentity(origId); Binder.restoreCallingIdentity(origId);
} }