Merge "Call method while holding lock." into lmp-dev (7e8ff5d1) · Commits · e / os / android_frameworks_base

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -3695,7 +3695,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		}

		//explicitly remove thd old information in mRecentTasks when removing existing user.
		private void removeRecentTasksForUser(int userId) {
		private void removeRecentTasksForUserLocked(int userId) {
		if(userId <= 0) {
		Slog.i(TAG, "Can't remove recent task on user " + userId);
		return;
		@@ -17724,10 +17724,10 @@ public final class ActivityManagerService extends ActivityManagerNative
		// Kill all the processes for the user.
		forceStopUserLocked(userId, "finish user");
		}
		}

		// Explicitly remove the old information in mRecentTasks.
		removeRecentTasksForUser(userId);
		removeRecentTasksForUserLocked(userId);
		}

		for (int i=0; i<callbacks.size(); i++) {
		try {