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

Merge "Fix issue #6636731: Mariner animation ring gets stuck" into jb-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2012-06-15 13:05:26 -07:00
committed by Android (Google) Code Review
parent 4de60b2609 6e3d6daa37
commit 17b9cec1b6
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/java/com/android/server/am/ActivityRecord.java
View File

@@ -164,6 +164,9 @@ final class ActivityRecord {
if (pendingResults != null) {
pw.print(prefix); pw.print("pendingResults="); pw.println(pendingResults);
}
if (pendingOptions != null) {
pw.print(prefix); pw.print("pendingOptions="); pw.println(pendingOptions);
}
if (uriPermissions != null) {
if (uriPermissions.readUriPermissions != null) {
pw.print(prefix); pw.print("readUriPermissions=");
@@ -202,7 +205,7 @@ final class ActivityRecord {
if (lastVisibleTime != 0 || waitingVisible || nowVisible) {
pw.print(prefix); pw.print("waitingVisible="); pw.print(waitingVisible);
pw.print(" nowVisible="); pw.print(nowVisible);
pw.print("lastVisibleTime=");
pw.print(" lastVisibleTime=");
TimeUtils.formatDuration(lastVisibleTime, pw); pw.println("");
}
if (configDestroy || configChangeFlags != 0) {
@@ -453,6 +456,7 @@ final class ActivityRecord {
if (task != null && !finishing) {
task.numActivities--;
}
clearOptionsLocked();
}
}
@@ -466,6 +470,9 @@ final class ActivityRecord {
if (task != null && inHistory) {
task.numActivities--;
}
if (stopped) {
clearOptionsLocked();
}
}
}

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

@@ -1055,7 +1055,9 @@ final class ActivityStack {
mHandler.removeMessages(STOP_TIMEOUT_MSG, r);
r.stopped = true;
r.state = ActivityState.STOPPED;
if (!r.finishing) {
if (r.finishing) {
r.clearOptionsLocked();
} else {
if (r.configDestroy) {
destroyActivityLocked(r, true, false, "stop-config");
resumeTopActivityLocked(null);