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

am 70273e05: Merge "Stop activity onVisibleBehindCanceled()" into lmp-mr1-dev

Browse Source 
* commit '70273e05b26f671dcec9ff1aa4bafabb5e407895':
  Stop activity onVisibleBehindCanceled()
This commit is contained in:
Wale Ogunwale
2014-11-20 01:49:37 +00:00
committed by Android Git Automerger
parent 0208d3c823 70273e05b2
commit 005080e5f8
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -6260,7 +6260,7 @@ public final class ActivityManagerService extends ActivityManagerNative
synchronized (this) { synchronized (this) {
ActivityStack stack = ActivityRecord.getStackLocked(token); ActivityStack stack = ActivityRecord.getStackLocked(token);
if (stack != null) { if (stack != null) {
stack.backgroundResourcesReleased(token); stack.backgroundResourcesReleased();
} }
} }
} finally { } finally {

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

@@ -3317,17 +3317,18 @@ final class ActivityStack {
mHandler.sendEmptyMessageDelayed(RELEASE_BACKGROUND_RESOURCES_TIMEOUT_MSG, 500); mHandler.sendEmptyMessageDelayed(RELEASE_BACKGROUND_RESOURCES_TIMEOUT_MSG, 500);
} else { } else {
Slog.e(TAG, "releaseBackgroundResources: activity " + r + " no longer running"); Slog.e(TAG, "releaseBackgroundResources: activity " + r + " no longer running");
backgroundResourcesReleased(r.appToken); backgroundResourcesReleased();
} }
} }
} }
final void backgroundResourcesReleased(IBinder token) { final void backgroundResourcesReleased() {
mHandler.removeMessages(RELEASE_BACKGROUND_RESOURCES_TIMEOUT_MSG); mHandler.removeMessages(RELEASE_BACKGROUND_RESOURCES_TIMEOUT_MSG);
final ActivityRecord r = getVisibleBehindActivity(); final ActivityRecord r = getVisibleBehindActivity();
if (r != null) { if (r != null) {
mStackSupervisor.mStoppingActivities.add(r); mStackSupervisor.mStoppingActivities.add(r);
setVisibleBehindActivity(null); setVisibleBehindActivity(null);
mStackSupervisor.scheduleIdleTimeoutLocked(null);
} }
mStackSupervisor.resumeTopActivitiesLocked(); mStackSupervisor.resumeTopActivitiesLocked();
} }