Merge "Move sleep from ActivityStack to Supervisor" (9bebad91) · Commits · e / os / android_frameworks_base

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

+8 −7

Original line number	Original line	Diff line number	Diff line
	@@ -6312,8 +6312,12 @@ public final class ActivityManagerService extends ActivityManagerNative

	@Override		@Override
	public int createStack(int taskId, int relativeStackId, int position, float weight) {		public int createStack(int taskId, int relativeStackId, int position, float weight) {
			if (DEBUG_STACK) Slog.d(TAG, "createStack: taskId=" + taskId + " relStackId=" +
			relativeStackId + " position=" + position + " weight=" + weight);
	synchronized (this) {		synchronized (this) {
	if (mStackSupervisor.getStack(relativeStackId) == null) {		if (mStackSupervisor.getStack(relativeStackId) == null) {
			if (DEBUG_STACK) Slog.d(TAG, "createStack: invalide relativeStackId=" +
			relativeStackId);
	return -1;		return -1;
	}		}
	int stackId = mStackSupervisor.createStack();		int stackId = mStackSupervisor.createStack();
	@@ -7378,17 +7382,14 @@ public final class ActivityManagerService extends ActivityManagerNative
	}		}

	public final void activitySlept(IBinder token) {		public final void activitySlept(IBinder token) {
	if (localLOGV) Slog.v(		if (localLOGV) Slog.v(TAG, "Activity slept: token=" + token);
	TAG, "Activity slept: token=" + token);

	ActivityRecord r = null;

	final long origId = Binder.clearCallingIdentity();		final long origId = Binder.clearCallingIdentity();

	synchronized (this) {		synchronized (this) {
	r = ActivityRecord.isInStackLocked(token);		final ActivityRecord r = ActivityRecord.isInStackLocked(token);
	if (r != null) {		if (r != null) {
	r.task.stack.activitySleptLocked(r);		mStackSupervisor.activitySleptLocked(r);
	}		}
	}		}

	@@ -9797,7 +9798,7 @@ public final class ActivityManagerService extends ActivityManagerNative
	pw.print(" mLastPowerCheckUptime=");		pw.print(" mLastPowerCheckUptime=");
	TimeUtils.formatDuration(mLastPowerCheckUptime, pw);		TimeUtils.formatDuration(mLastPowerCheckUptime, pw);
	pw.println("");		pw.println("");
	pw.println(" mGoingToSleep=" + getFocusedStack().mGoingToSleep);		pw.println(" mGoingToSleep=" + mStackSupervisor.mGoingToSleep);
	pw.println(" mLaunchingActivity=" + getFocusedStack().mLaunchingActivity);		pw.println(" mLaunchingActivity=" + getFocusedStack().mLaunchingActivity);
	pw.println(" mAdjSeq=" + mAdjSeq + " mLruSeq=" + mLruSeq);		pw.println(" mAdjSeq=" + mAdjSeq + " mLruSeq=" + mLruSeq);
	pw.println(" mNumNonHiddenProcs=" + mNumNonHiddenProcs		pw.println(" mNumNonHiddenProcs=" + mNumNonHiddenProcs

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

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -926,14 +926,12 @@ final class ActivityRecord {
	if (app != null && app.thread != null) {		if (app != null && app.thread != null) {
	try {		try {
	app.thread.scheduleSleeping(appToken, _sleeping);		app.thread.scheduleSleeping(appToken, _sleeping);
	final ActivityStack stack = task.stack;		if (_sleeping && !mStackSupervisor.mGoingToSleepActivities.contains(this)) {
	if (sleeping && !stack.mGoingToSleepActivities.contains(this)) {		mStackSupervisor.mGoingToSleepActivities.add(this);
	stack.mGoingToSleepActivities.add(this);
	}		}
	sleeping = _sleeping;		sleeping = _sleeping;
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Slog.w(ActivityStack.TAG, "Exception thrown when sleeping: "		Slog.w(TAG, "Exception thrown when sleeping: " + intent.getComponent(), e);
	+ intent.getComponent(), e);
	}		}
	}		}
	}		}

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

+66 −143

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,24 @@

	package com.android.server.am;		package com.android.server.am;

			import static com.android.server.am.ActivityManagerService.TAG;
			import static com.android.server.am.ActivityManagerService.localLOGV;
			import static com.android.server.am.ActivityManagerService.DEBUG_CLEANUP;
			import static com.android.server.am.ActivityManagerService.DEBUG_CONFIGURATION;
			import static com.android.server.am.ActivityManagerService.DEBUG_PAUSE;
			import static com.android.server.am.ActivityManagerService.DEBUG_RESULTS;
			import static com.android.server.am.ActivityManagerService.DEBUG_STACK;
			import static com.android.server.am.ActivityManagerService.DEBUG_SWITCH;
			import static com.android.server.am.ActivityManagerService.DEBUG_TASKS;
			import static com.android.server.am.ActivityManagerService.DEBUG_TRANSITION;
			import static com.android.server.am.ActivityManagerService.DEBUG_USER_LEAVING;
			import static com.android.server.am.ActivityManagerService.DEBUG_VISBILITY;
			import static com.android.server.am.ActivityManagerService.VALIDATE_TOKENS;

			import static com.android.server.am.ActivityStackSupervisor.DEBUG_ADD_REMOVE;
			import static com.android.server.am.ActivityStackSupervisor.DEBUG_APP;
			import static com.android.server.am.ActivityStackSupervisor.DEBUG_SAVED_STATE;
			import static com.android.server.am.ActivityStackSupervisor.DEBUG_STATES;
	import static com.android.server.am.ActivityStackSupervisor.HOME_STACK_ID;		import static com.android.server.am.ActivityStackSupervisor.HOME_STACK_ID;

	import com.android.internal.os.BatteryStatsImpl;		import com.android.internal.os.BatteryStatsImpl;
	@@ -70,25 +88,6 @@ import java.util.List;
	* State and management of a single stack of activities.		* State and management of a single stack of activities.
	*/		*/
	final class ActivityStack {		final class ActivityStack {
	static final String TAG = ActivityManagerService.TAG;
	static final boolean localLOGV = ActivityManagerService.localLOGV;
	static final boolean DEBUG_SWITCH = ActivityManagerService.DEBUG_SWITCH;
	static final boolean DEBUG_PAUSE = ActivityManagerService.DEBUG_PAUSE;
	static final boolean DEBUG_VISBILITY = ActivityManagerService.DEBUG_VISBILITY;
	static final boolean DEBUG_USER_LEAVING = ActivityManagerService.DEBUG_USER_LEAVING;
	static final boolean DEBUG_TRANSITION = ActivityManagerService.DEBUG_TRANSITION;
	static final boolean DEBUG_RESULTS = ActivityManagerService.DEBUG_RESULTS;
	static final boolean DEBUG_CONFIGURATION = ActivityManagerService.DEBUG_CONFIGURATION;
	static final boolean DEBUG_TASKS = ActivityManagerService.DEBUG_TASKS;
	static final boolean DEBUG_CLEANUP = ActivityManagerService.DEBUG_CLEANUP;
	static final boolean DEBUG_STACK = ActivityManagerService.DEBUG_STACK;

	static final boolean DEBUG_STATES = ActivityStackSupervisor.DEBUG_STATES;
	static final boolean DEBUG_ADD_REMOVE = ActivityStackSupervisor.DEBUG_ADD_REMOVE;
	static final boolean DEBUG_SAVED_STATE = ActivityStackSupervisor.DEBUG_SAVED_STATE;
	static final boolean DEBUG_APP = ActivityStackSupervisor.DEBUG_APP;

	static final boolean VALIDATE_TOKENS = ActivityManagerService.VALIDATE_TOKENS;

	// Ticks during which we check progress while waiting for an app to launch.		// Ticks during which we check progress while waiting for an app to launch.
	static final int LAUNCH_TICK = 500;		static final int LAUNCH_TICK = 500;
	@@ -103,9 +102,6 @@ final class ActivityStack {
	// from the application in order to get its saved state.		// from the application in order to get its saved state.
	static final int STOP_TIMEOUT = 10*1000;		static final int STOP_TIMEOUT = 10*1000;

	// How long we can hold the sleep wake lock before giving up.
	static final int SLEEP_TIMEOUT = 5*1000;

	// How long we can hold the launch wake lock before giving up.		// How long we can hold the launch wake lock before giving up.
	static final int LAUNCH_TIMEOUT = 10*1000;		static final int LAUNCH_TIMEOUT = 10*1000;

	@@ -160,24 +156,12 @@ final class ActivityStack {
	*/		*/
	final ArrayList<ActivityRecord> mLRUActivities = new ArrayList<ActivityRecord>();		final ArrayList<ActivityRecord> mLRUActivities = new ArrayList<ActivityRecord>();

	/**
	* List of activities that are in the process of going to sleep.
	*/
	final ArrayList<ActivityRecord> mGoingToSleepActivities = new ArrayList<ActivityRecord>();

	/**		/**
	* Animations that for the current transition have requested not to		* Animations that for the current transition have requested not to
	* be considered for the transition animation.		* be considered for the transition animation.
	*/		*/
	final ArrayList<ActivityRecord> mNoAnimActivities = new ArrayList<ActivityRecord>();		final ArrayList<ActivityRecord> mNoAnimActivities = new ArrayList<ActivityRecord>();

	/**
	* Set when the system is going to sleep, until we have
	* successfully paused the current activity and released our wake lock.
	* At that point the system is allowed to actually sleep.
	*/
	final PowerManager.WakeLock mGoingToSleep;

	/**		/**
	* We don't want to allow the device to go to sleep while in the process		* We don't want to allow the device to go to sleep while in the process
	* of launching an activity. This is primarily to allow alarm intent		* of launching an activity. This is primarily to allow alarm intent
	@@ -219,11 +203,6 @@ final class ActivityStack {

	long mInitialStartTime = 0;		long mInitialStartTime = 0;

	/**
	* Set when we have taken too long waiting to go to sleep.
	*/
	boolean mSleepTimeout = false;

	/**		/**
	* Save the most recent screenshot for reuse. This keeps Recents from taking two identical		* Save the most recent screenshot for reuse. This keeps Recents from taking two identical
	* screenshots, one for the Recents thumbnail and one for the pauseActivity thumbnail.		* screenshots, one for the Recents thumbnail and one for the pauseActivity thumbnail.
	@@ -241,13 +220,12 @@ final class ActivityStack {
	/** Run all ActivityStacks through this */		/** Run all ActivityStacks through this */
	final ActivityStackSupervisor mStackSupervisor;		final ActivityStackSupervisor mStackSupervisor;

	static final int SLEEP_TIMEOUT_MSG = ActivityManagerService.FIRST_ACTIVITY_STACK_MSG;		static final int PAUSE_TIMEOUT_MSG = ActivityManagerService.FIRST_ACTIVITY_STACK_MSG;
	static final int PAUSE_TIMEOUT_MSG = ActivityManagerService.FIRST_ACTIVITY_STACK_MSG + 1;		static final int LAUNCH_TIMEOUT_MSG = ActivityManagerService.FIRST_ACTIVITY_STACK_MSG + 1;
	static final int LAUNCH_TIMEOUT_MSG = ActivityManagerService.FIRST_ACTIVITY_STACK_MSG + 2;		static final int DESTROY_TIMEOUT_MSG = ActivityManagerService.FIRST_ACTIVITY_STACK_MSG + 2;
	static final int DESTROY_TIMEOUT_MSG = ActivityManagerService.FIRST_ACTIVITY_STACK_MSG + 3;		static final int LAUNCH_TICK_MSG = ActivityManagerService.FIRST_ACTIVITY_STACK_MSG + 3;
	static final int LAUNCH_TICK_MSG = ActivityManagerService.FIRST_ACTIVITY_STACK_MSG + 4;		static final int STOP_TIMEOUT_MSG = ActivityManagerService.FIRST_ACTIVITY_STACK_MSG + 4;
	static final int STOP_TIMEOUT_MSG = ActivityManagerService.FIRST_ACTIVITY_STACK_MSG + 5;		static final int DESTROY_ACTIVITIES_MSG = ActivityManagerService.FIRST_ACTIVITY_STACK_MSG + 5;
	static final int DESTROY_ACTIVITIES_MSG = ActivityManagerService.FIRST_ACTIVITY_STACK_MSG + 6;

	static class ScheduleDestroyArgs {		static class ScheduleDestroyArgs {
	final ProcessRecord mOwner;		final ProcessRecord mOwner;
	@@ -273,15 +251,6 @@ final class ActivityStack {
	@Override		@Override
	public void handleMessage(Message msg) {		public void handleMessage(Message msg) {
	switch (msg.what) {		switch (msg.what) {
	case SLEEP_TIMEOUT_MSG: {
	synchronized (mService) {
	if (mService.isSleepingOrShuttingDown()) {
	Slog.w(TAG, "Sleep timeout! Sleeping now.");
	mSleepTimeout = true;
	checkReadyForSleepLocked();
	}
	}
	} break;
	case PAUSE_TIMEOUT_MSG: {		case PAUSE_TIMEOUT_MSG: {
	ActivityRecord r = (ActivityRecord)msg.obj;		ActivityRecord r = (ActivityRecord)msg.obj;
	// We don't at this point know if the activity is fullscreen,		// We don't at this point know if the activity is fullscreen,
	@@ -362,9 +331,7 @@ final class ActivityStack {
	mWindowManager = service.mWindowManager;		mWindowManager = service.mWindowManager;
	mStackSupervisor = service.mStackSupervisor;		mStackSupervisor = service.mStackSupervisor;
	mContext = context;		mContext = context;
	PowerManager pm =		PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
	(PowerManager)context.getSystemService(Context.POWER_SERVICE);
	mGoingToSleep = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "ActivityManager-Sleep");
	mLaunchingActivity =		mLaunchingActivity =
	pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "ActivityManager-Launch");		pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "ActivityManager-Launch");
	mLaunchingActivity.setReferenceCounted(false);		mLaunchingActivity.setReferenceCounted(false);
	@@ -615,7 +582,7 @@ final class ActivityStack {
	r.task.touchActiveTime();		r.task.touchActiveTime();
	mService.addRecentTaskLocked(r.task);		mService.addRecentTaskLocked(r.task);
	completeResumeLocked(r);		completeResumeLocked(r);
	checkReadyForSleepLocked();		mStackSupervisor.checkReadyForSleepLocked();
	if (DEBUG_SAVED_STATE) Slog.i(TAG, "Launch completed; removing icicle of " + r.icicle);		if (DEBUG_SAVED_STATE) Slog.i(TAG, "Launch completed; removing icicle of " + r.icicle);
	}		}

	@@ -631,71 +598,43 @@ final class ActivityStack {
	}		}

	void stopIfSleepingLocked() {		void stopIfSleepingLocked() {
	if (mService.isSleepingOrShuttingDown()) {
	if (!mGoingToSleep.isHeld()) {
	mGoingToSleep.acquire();
	if (mLaunchingActivity.isHeld()) {		if (mLaunchingActivity.isHeld()) {
	mLaunchingActivity.release();		mLaunchingActivity.release();
	mService.mHandler.removeMessages(LAUNCH_TIMEOUT_MSG);		mService.mHandler.removeMessages(LAUNCH_TIMEOUT_MSG);
	}		}
	}		}
	mHandler.removeMessages(SLEEP_TIMEOUT_MSG);
	Message msg = mHandler.obtainMessage(SLEEP_TIMEOUT_MSG);
	mHandler.sendMessageDelayed(msg, SLEEP_TIMEOUT);
	checkReadyForSleepLocked();
	}
	}

	void awakeFromSleepingLocked() {		void awakeFromSleepingLocked() {
	mHandler.removeMessages(SLEEP_TIMEOUT_MSG);
	mSleepTimeout = false;
	if (mGoingToSleep.isHeld()) {
	mGoingToSleep.release();
	}
	// Ensure activities are no longer sleeping.		// Ensure activities are no longer sleeping.
	for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) {		for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) {
	final ArrayList<ActivityRecord> activities = mTaskHistory.get(taskNdx).mActivities;		final ArrayList<ActivityRecord> activities = mTaskHistory.get(taskNdx).mActivities;
	for (int activityNdx = activities.size() - 1; activityNdx >= 0; --activityNdx) {		for (int activityNdx = activities.size() - 1; activityNdx >= 0; --activityNdx) {
	// TODO: Skip if finishing?
	activities.get(activityNdx).setSleeping(false);		activities.get(activityNdx).setSleeping(false);
	}		}
	}		}
	mGoingToSleepActivities.clear();
	}

	void activitySleptLocked(ActivityRecord r) {
	mGoingToSleepActivities.remove(r);
	checkReadyForSleepLocked();
	}

	void checkReadyForSleepLocked() {
	if (!mService.isSleepingOrShuttingDown()) {
	// Do not care.
	return;
	}		}

	if (!mSleepTimeout) {		/**
			* @return true if something must be done before going to sleep.
			*/
			boolean checkReadyForSleepLocked() {
	if (mResumedActivity != null) {		if (mResumedActivity != null) {
	// Still have something resumed; can't sleep until it is paused.		// Still have something resumed; can't sleep until it is paused.
	if (DEBUG_PAUSE) Slog.v(TAG, "Sleep needs to pause " + mResumedActivity);		if (DEBUG_PAUSE) Slog.v(TAG, "Sleep needs to pause " + mResumedActivity);
	if (DEBUG_USER_LEAVING) Slog.v(TAG, "Sleep => pause with userLeaving=false");		if (DEBUG_USER_LEAVING) Slog.v(TAG, "Sleep => pause with userLeaving=false");
	startPausingLocked(false, true);		startPausingLocked(false, true);
	return;		return true;
	}		}
	if (mPausingActivity != null) {		if (mPausingActivity != null) {
	// Still waiting for something to pause; can't sleep yet.		// Still waiting for something to pause; can't sleep yet.
	if (DEBUG_PAUSE) Slog.v(TAG, "Sleep still waiting to pause " + mPausingActivity);		if (DEBUG_PAUSE) Slog.v(TAG, "Sleep still waiting to pause " + mPausingActivity);
	return;		return true;
	}		}

	if (mStackSupervisor.mStoppingActivities.size() > 0) {		return false;
	// Still need to tell some activities to stop; can't sleep yet.
	if (DEBUG_PAUSE) Slog.v(TAG, "Sleep still need to stop "
	+ mStackSupervisor.mStoppingActivities.size() + " activities");
	mStackSupervisor.scheduleIdleLocked();
	return;
	}		}

			void goToSleep() {
	ensureActivitiesVisibleLocked(null, 0);		ensureActivitiesVisibleLocked(null, 0);

	// Make sure any stopped but visible activities are now sleeping.		// Make sure any stopped but visible activities are now sleeping.
	@@ -709,23 +648,6 @@ final class ActivityStack {
	}		}
	}		}
	}		}

	if (mGoingToSleepActivities.size() > 0) {
	// Still need to tell some activities to sleep; can't sleep yet.
	if (DEBUG_PAUSE) Slog.v(TAG, "Sleep still need to sleep "
	+ mGoingToSleepActivities.size() + " activities");
	return;
	}
	}

	mHandler.removeMessages(SLEEP_TIMEOUT_MSG);

	if (mGoingToSleep.isHeld()) {
	mGoingToSleep.release();
	}
	if (mService.mShuttingDown) {
	mService.notifyAll();
	}
	}		}

	public final Bitmap screenshotActivities(ActivityRecord who) {		public final Bitmap screenshotActivities(ActivityRecord who) {
	@@ -943,7 +865,7 @@ final class ActivityStack {
	if (DEBUG_PAUSE) Slog.v(TAG, "To many pending stops, forcing idle");		if (DEBUG_PAUSE) Slog.v(TAG, "To many pending stops, forcing idle");
	mStackSupervisor.scheduleIdleLocked();		mStackSupervisor.scheduleIdleLocked();
	} else {		} else {
	checkReadyForSleepLocked();		mStackSupervisor.checkReadyForSleepLocked();
	}		}
	}		}
	} else {		} else {
	@@ -957,7 +879,7 @@ final class ActivityStack {
	if (!mService.isSleepingOrShuttingDown()) {		if (!mService.isSleepingOrShuttingDown()) {
	mStackSupervisor.resumeTopActivitiesLocked(topStack, prev, null);		mStackSupervisor.resumeTopActivitiesLocked(topStack, prev, null);
	} else {		} else {
	checkReadyForSleepLocked();		mStackSupervisor.checkReadyForSleepLocked();
	ActivityRecord top = topStack.topRunningActivityLocked(null);		ActivityRecord top = topStack.topRunningActivityLocked(null);
	if (top == null \|\| (prev != null && top != prev)) {		if (top == null \|\| (prev != null && top != prev)) {
	// If there are no more activities available to run,		// If there are no more activities available to run,
	@@ -1272,7 +1194,7 @@ final class ActivityStack {
	// The activity may be waiting for stop, but that is no longer		// The activity may be waiting for stop, but that is no longer
	// appropriate for it.		// appropriate for it.
	mStackSupervisor.mStoppingActivities.remove(next);		mStackSupervisor.mStoppingActivities.remove(next);
	mGoingToSleepActivities.remove(next);		mStackSupervisor.mGoingToSleepActivities.remove(next);
	next.sleeping = false;		next.sleeping = false;
	mStackSupervisor.mWaitingVisibleActivities.remove(next);		mStackSupervisor.mWaitingVisibleActivities.remove(next);

	@@ -1530,7 +1452,7 @@ final class ActivityStack {
	next.app.thread.scheduleResumeActivity(next.appToken,		next.app.thread.scheduleResumeActivity(next.appToken,
	mService.isNextTransitionForward());		mService.isNextTransitionForward());

	checkReadyForSleepLocked();		mStackSupervisor.checkReadyForSleepLocked();

	} catch (Exception e) {		} catch (Exception e) {
	// Whoops, need to restart this activity!		// Whoops, need to restart this activity!
	@@ -2395,7 +2317,7 @@ final class ActivityStack {
	// will be empty and must be cleared immediately.		// will be empty and must be cleared immediately.
	mStackSupervisor.scheduleIdleLocked();		mStackSupervisor.scheduleIdleLocked();
	} else {		} else {
	checkReadyForSleepLocked();		mStackSupervisor.checkReadyForSleepLocked();
	}		}
	}		}
	if (DEBUG_STATES) Slog.v(TAG, "Moving to STOPPING: " + r		if (DEBUG_STATES) Slog.v(TAG, "Moving to STOPPING: " + r
	@@ -2409,7 +2331,7 @@ final class ActivityStack {

	// make sure the record is cleaned out of other places.		// make sure the record is cleaned out of other places.
	mStackSupervisor.mStoppingActivities.remove(r);		mStackSupervisor.mStoppingActivities.remove(r);
	mGoingToSleepActivities.remove(r);		mStackSupervisor.mGoingToSleepActivities.remove(r);
	mStackSupervisor.mWaitingVisibleActivities.remove(r);		mStackSupervisor.mWaitingVisibleActivities.remove(r);
	if (mResumedActivity == r) {		if (mResumedActivity == r) {
	mResumedActivity = null;		mResumedActivity = null;
	@@ -2815,7 +2737,8 @@ final class ActivityStack {
	removeHistoryRecordsForAppLocked(mLRUActivities, app, "mLRUActivities");		removeHistoryRecordsForAppLocked(mLRUActivities, app, "mLRUActivities");
	removeHistoryRecordsForAppLocked(mStackSupervisor.mStoppingActivities, app,		removeHistoryRecordsForAppLocked(mStackSupervisor.mStoppingActivities, app,
	"mStoppingActivities");		"mStoppingActivities");
	removeHistoryRecordsForAppLocked(mGoingToSleepActivities, app, "mGoingToSleepActivities");		removeHistoryRecordsForAppLocked(mStackSupervisor.mGoingToSleepActivities, app,
			"mGoingToSleepActivities");
	removeHistoryRecordsForAppLocked(mStackSupervisor.mWaitingVisibleActivities, app,		removeHistoryRecordsForAppLocked(mStackSupervisor.mWaitingVisibleActivities, app,
	"mWaitingVisibleActivities");		"mWaitingVisibleActivities");
	removeHistoryRecordsForAppLocked(mStackSupervisor.mFinishingActivities, app,		removeHistoryRecordsForAppLocked(mStackSupervisor.mFinishingActivities, app,
	@@ -2850,7 +2773,7 @@ final class ActivityStack {
	remove = false;		remove = false;
	}		}
	if (remove) {		if (remove) {
	if (ActivityStack.DEBUG_ADD_REMOVE \|\| DEBUG_CLEANUP) {		if (DEBUG_ADD_REMOVE \|\| DEBUG_CLEANUP) {
	RuntimeException here = new RuntimeException("here");		RuntimeException here = new RuntimeException("here");
	here.fillInStackTrace();		here.fillInStackTrace();
	Slog.i(TAG, "Removing activity " + r + " from stack at " + i		Slog.i(TAG, "Removing activity " + r + " from stack at " + i
	@@ -2884,7 +2807,7 @@ final class ActivityStack {
	r.app = null;		r.app = null;
	r.nowVisible = false;		r.nowVisible = false;
	if (!r.haveState) {		if (!r.haveState) {
	if (ActivityStack.DEBUG_SAVED_STATE) Slog.i(TAG,		if (DEBUG_SAVED_STATE) Slog.i(TAG,
	"App died, clearing saved state of " + r);		"App died, clearing saved state of " + r);
	r.icicle = null;		r.icicle = null;
	}		}

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

+138 −25

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,7 @@
	package com.android.server.am;		package com.android.server.am;

	import static com.android.server.am.ActivityManagerService.TAG;		import static com.android.server.am.ActivityManagerService.TAG;
	import static com.android.server.am.ActivityStack.DEBUG_ADD_REMOVE;		import static com.android.server.am.ActivityStackSupervisor.DEBUG_ADD_REMOVE;

	import android.app.Activity;		import android.app.Activity;
	import android.app.ActivityManager;		import android.app.ActivityManager;