am 99e33bf1: am 17b9cec1: Merge "Fix issue #6636731: Mariner animation ring gets stuck" into jb-dev (468a0051) · Commits · e / os / android_frameworks_base

services/java/com/android/server/am/ActivityRecord.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -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=");
		@@ -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();
		}
		}
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -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);