Merge change Ice5e9209 into eclair (48e9a0dd) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -2252,7 +2252,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
		mHandler.sendMessage(msg);
		}

		reportResumedActivity(next);
		reportResumedActivityLocked(next);

		next.thumbnail = null;
		setFocusedActivityLocked(next);
		@@ -2525,7 +2525,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
		}
		}

		private void reportResumedActivity(HistoryRecord r) {
		private void reportResumedActivityLocked(HistoryRecord r) {
		//Log.i(TAG, "**** REPORT RESUME: " + r);

		final int identHash = System.identityHashCode(r);
		@@ -12814,6 +12814,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
		if (andResume) {
		r.results = null;
		r.newIntents = null;
		reportResumedActivityLocked(r);
		}

		return true;