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

am 1e910d17: am 70273e05: Merge "Stop activity onVisibleBehindCanceled()" into lmp-mr1-dev automerge: 005080e

Browse Source 
* commit '1e910d17cef3ef21c09ead282b829ab7bb7bdedb':
  Stop activity onVisibleBehindCanceled()
This commit is contained in:
Wale Ogunwale
2014-11-20 21:24:09 +00:00
committed by Android Git Automerger
parent 44412936ff 1e910d17ce
commit 892d43bad6
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) {
ActivityStack stack = ActivityRecord.getStackLocked(token);
if (stack != null) {
stack.backgroundResourcesReleased(token);
stack.backgroundResourcesReleased();
}
}
} 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);
} else {
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);
final ActivityRecord r = getVisibleBehindActivity();
if (r != null) {
mStackSupervisor.mStoppingActivities.add(r);
setVisibleBehindActivity(null);
mStackSupervisor.scheduleIdleTimeoutLocked(null);
}
mStackSupervisor.resumeTopActivitiesLocked();
}