Removed debug code that is never. (686ae0e3) · Commits · e / os / android_frameworks_base

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

+0 −58

Original line number	Diff line number	Diff line
		@@ -126,7 +126,6 @@ import com.android.internal.os.BatteryStatsImpl;
		import com.android.server.Watchdog;
		import com.android.server.am.ActivityManagerService.ItemMatcher;
		import com.android.server.am.ActivityStackSupervisor.ActivityContainer;
		import com.android.server.wm.TaskGroup;
		import com.android.server.wm.WindowManagerService;

		import java.io.FileDescriptor;
		@@ -162,8 +161,6 @@ final class ActivityStack {
		private static final String TAG_USER_LEAVING = TAG + POSTFIX_USER_LEAVING;
		private static final String TAG_VISIBILITY = TAG + POSTFIX_VISIBILITY;

		private static final boolean VALIDATE_TOKENS = false;

		// Ticks during which we check progress while waiting for an app to launch.
		static final int LAUNCH_TICK = 500;

		@@ -241,11 +238,6 @@ final class ActivityStack {
		*/
		private final ArrayList<TaskRecord> mTaskHistory = new ArrayList<>();

		/**
		* Used for validating app tokens with window manager.
		*/
		final ArrayList<TaskGroup> mValidateAppTokens = new ArrayList<>();

		/**
		* List of running activities, sorted by recent usage.
		* The first entry in the list is the least recently used.
		@@ -899,9 +891,6 @@ final class ActivityStack {
		++i;
		}
		}
		if (VALIDATE_TOKENS) {
		validateAppTokensLocked();
		}
		}

		void minimalResumeActivityLocked(ActivityRecord r) {
		@@ -2763,9 +2752,6 @@ final class ActivityStack {
		task.addActivityToTop(r);
		r.putInHistory();
		addConfigOverride(r, task);
		if (VALIDATE_TOKENS) {
		validateAppTokensLocked();
		}
		ActivityOptions.abort(options);
		return;
		}
		@@ -2867,35 +2853,9 @@ final class ActivityStack {
		// because there is nothing for it to animate on top of.
		addConfigOverride(r, task);
		ActivityOptions.abort(options);
		options = null;
		}
		if (VALIDATE_TOKENS) {
		validateAppTokensLocked();
		}
		}

		final void validateAppTokensLocked() {
		mValidateAppTokens.clear();
		mValidateAppTokens.ensureCapacity(numActivities());
		final int numTasks = mTaskHistory.size();
		for (int taskNdx = 0; taskNdx < numTasks; ++taskNdx) {
		TaskRecord task = mTaskHistory.get(taskNdx);
		final ArrayList<ActivityRecord> activities = task.mActivities;
		if (activities.isEmpty()) {
		continue;
		}
		TaskGroup group = new TaskGroup();
		group.taskId = task.taskId;
		mValidateAppTokens.add(group);
		final int numActivities = activities.size();
		for (int activityNdx = 0; activityNdx < numActivities; ++activityNdx) {
		final ActivityRecord r = activities.get(activityNdx);
		group.tokens.add(r.appToken);
		}
		}
		mWindowManager.validateAppTokens(mStackId, mValidateAppTokens);
		}

		/**
		* Perform a reset of the given task, if needed as part of launching it.
		* Returns the new HistoryRecord at the top of the task.
		@@ -3005,10 +2965,6 @@ final class ActivityStack {
		}

		mWindowManager.moveTaskToBottom(targetTask.taskId);
		if (VALIDATE_TOKENS) {
		validateAppTokensLocked();
		}

		replyChainEnd = -1;
		} else if (forceReset \|\| finishOnTaskLaunch \|\| clearWhenTaskReset) {
		// If the activity should just be removed -- either
		@@ -3146,9 +3102,6 @@ final class ActivityStack {
		setAppTask(p, task);
		}
		mWindowManager.moveTaskToTop(taskId);
		if (VALIDATE_TOKENS) {
		validateAppTokensLocked();
		}

		// Now we've moved it in to place... but what if this is
		// a singleTop activity and we have put it on top of another
		@@ -3897,9 +3850,6 @@ final class ActivityStack {
		if (DEBUG_APP) Slog.v(TAG_APP, "Clearing app during remove for activity " + r);
		r.app = null;
		mWindowManager.removeAppToken(r.appToken);
		if (VALIDATE_TOKENS) {
		validateAppTokensLocked();
		}
		final TaskRecord task = r.task;
		if (task != null && task.removeActivity(r)) {
		if (DEBUG_STACK) Slog.i(TAG_STACK,
		@@ -4395,10 +4345,6 @@ final class ActivityStack {

		mStackSupervisor.resumeFocusedStackTopActivityLocked();
		EventLog.writeEvent(EventLogTags.AM_TASK_TO_FRONT, tr.userId, tr.taskId);

		if (VALIDATE_TOKENS) {
		validateAppTokensLocked();
		}
		}

		/**
		@@ -4513,10 +4459,6 @@ final class ActivityStack {
		mWindowManager.prepareAppTransition(TRANSIT_TASK_TO_BACK, false);
		mWindowManager.moveTaskToBottom(taskId);

		if (VALIDATE_TOKENS) {
		validateAppTokensLocked();
		}

		final TaskRecord task = mResumedActivity != null ? mResumedActivity.task : null;
		if (prevIsHome \|\| (task == tr && canGoHome) \|\| (numTasks <= 1 && isOnHomeDisplay())) {
		if (!mService.mBooting && !mService.mBooted) {

services/core/java/com/android/server/wm/TaskGroup.java

deleted100644 → 0

+0 −31

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2013 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.server.wm;

		import android.view.IApplicationToken;

		import java.util.ArrayList;

		public class TaskGroup {
		public int taskId = -1;
		public ArrayList<IApplicationToken> tokens = new ArrayList<IApplicationToken>();

		@Override
		public String toString() {
		return "id=" + taskId + " tokens=" + tokens;
		}
		}

services/core/java/com/android/server/wm/WindowManagerService.java

+0 −68

Original line number	Diff line number	Diff line
		@@ -2638,74 +2638,6 @@ public class WindowManagerService extends IWindowManager.Stub
		return atoken.mAppAnimator.animation != null;
		}

		// -------------------------------------------------------------
		// Application Window Tokens
		// -------------------------------------------------------------

		public void validateAppTokens(int stackId, List<TaskGroup> tasks) {
		synchronized (mWindowMap) {
		int t = tasks.size() - 1;
		if (t < 0) {
		Slog.w(TAG_WM, "validateAppTokens: empty task list");
		return;
		}

		TaskGroup task = tasks.get(0);
		int taskId = task.taskId;
		Task targetTask = mTaskIdToTask.get(taskId);
		DisplayContent displayContent = targetTask.getDisplayContent();
		if (displayContent == null) {
		Slog.w(TAG_WM, "validateAppTokens: no Display for taskId=" + taskId);
		return;
		}

		final ArrayList<Task> localTasks = mStackIdToStack.get(stackId).getTasks();
		int taskNdx;
		for (taskNdx = localTasks.size() - 1; taskNdx >= 0 && t >= 0; --taskNdx, --t) {
		AppTokenList localTokens = localTasks.get(taskNdx).mAppTokens;
		task = tasks.get(t);
		List<IApplicationToken> tokens = task.tokens;

		DisplayContent lastDisplayContent = displayContent;
		displayContent = mTaskIdToTask.get(taskId).getDisplayContent();
		if (displayContent != lastDisplayContent) {
		Slog.w(TAG_WM, "validateAppTokens: displayContent changed in TaskGroup list!");
		return;
		}

		int tokenNdx;
		int v;
		for (tokenNdx = localTokens.size() - 1, v = task.tokens.size() - 1;
		tokenNdx >= 0 && v >= 0; ) {
		final AppWindowToken atoken = localTokens.get(tokenNdx);
		if (atoken.removed) {
		--tokenNdx;
		continue;
		}
		if (tokens.get(v) != atoken.token) {
		break;
		}
		--tokenNdx;
		v--;
		}

		if (tokenNdx >= 0 \|\| v >= 0) {
		break;
		}
		}

		if (taskNdx >= 0 \|\| t >= 0) {
		Slog.w(TAG_WM, "validateAppTokens: Mismatch! ActivityManager=" + tasks);
		Slog.w(TAG_WM, "validateAppTokens: Mismatch! WindowManager=" + localTasks);
		Slog.w(TAG_WM, "validateAppTokens: Mismatch! Callers=" + Debug.getCallers(4));
		}
		}
		}

		public void validateStackOrder(Integer[] remoteStackIds) {
		// TODO:
		}

		private boolean checkCallingPermission(String permission, String func) {
		// Quick check: if the calling permission is me, it's all okay.
		if (Binder.getCallingPid() == Process.myPid()) {