Merge "Fix black screen during Quick switch" into rvc-dev am: c82ee307b1 am:... (cdacf0b9) · Commits · e / os / android_frameworks_base

data/etc/services.core.protolog.json

+6 −24

Original line number	Original line	Diff line number	Diff line
	@@ -85,12 +85,6 @@
	"group": "WM_DEBUG_ADD_REMOVE",		"group": "WM_DEBUG_ADD_REMOVE",
	"at": "com\/android\/server\/wm\/WindowManagerService.java"		"at": "com\/android\/server\/wm\/WindowManagerService.java"
	},		},
	"-1953668890": {
	"message": "Can't start recents animation, nextAppTransition=%s",
	"level": "DEBUG",
	"group": "WM_DEBUG_RECENTS_ANIMATIONS",
	"at": "com\/android\/server\/wm\/RecentsAnimation.java"
	},
	"-1949279037": {		"-1949279037": {
	"message": "Attempted to add input method window with bad token %s. Aborting.",		"message": "Attempted to add input method window with bad token %s. Aborting.",
	"level": "WARN",		"level": "WARN",
	@@ -889,12 +883,6 @@
	"group": "WM_DEBUG_ORIENTATION",		"group": "WM_DEBUG_ORIENTATION",
	"at": "com\/android\/server\/wm\/ActivityRecord.java"		"at": "com\/android\/server\/wm\/ActivityRecord.java"
	},		},
	"-242787066": {
	"message": "addTaskToRecentsAnimationIfNeeded, control: %s, task: %s, transit: %s",
	"level": "DEBUG",
	"group": "WM_DEBUG_RECENTS_ANIMATIONS",
	"at": "com\/android\/server\/wm\/WindowContainer.java"
	},
	"-198463978": {		"-198463978": {
	"message": "updateRotationUnchecked: alwaysSendConfiguration=%b forceRelayout=%b",		"message": "updateRotationUnchecked: alwaysSendConfiguration=%b forceRelayout=%b",
	"level": "VERBOSE",		"level": "VERBOSE",
	@@ -1135,6 +1123,12 @@
	"group": "WM_DEBUG_ORIENTATION",		"group": "WM_DEBUG_ORIENTATION",
	"at": "com\/android\/server\/wm\/DisplayRotation.java"		"at": "com\/android\/server\/wm\/DisplayRotation.java"
	},		},
			"210750281": {
			"message": "applyAnimationUnchecked, control: %s, task: %s, transit: %s",
			"level": "DEBUG",
			"group": "WM_DEBUG_RECENTS_ANIMATIONS",
			"at": "com\/android\/server\/wm\/Task.java"
			},
	"221540118": {		"221540118": {
	"message": "mUserActivityTimeout set to %d",		"message": "mUserActivityTimeout set to %d",
	"level": "DEBUG",		"level": "DEBUG",
	@@ -1543,24 +1537,12 @@
	"group": "WM_ERROR",		"group": "WM_ERROR",
	"at": "com\/android\/server\/wm\/WindowToken.java"		"at": "com\/android\/server\/wm\/WindowToken.java"
	},		},
	"845234215": {
	"message": "App is requesting an orientation, return %d for display id=%d",
	"level": "VERBOSE",
	"group": "WM_DEBUG_ORIENTATION",
	"at": "com\/android\/server\/wm\/DisplayContent.java"
	},
	"853091290": {		"853091290": {
	"message": "Moved stack=%s behind stack=%s",		"message": "Moved stack=%s behind stack=%s",
	"level": "DEBUG",		"level": "DEBUG",
	"group": "WM_DEBUG_RECENTS_ANIMATIONS",		"group": "WM_DEBUG_RECENTS_ANIMATIONS",
	"at": "com\/android\/server\/wm\/RecentsAnimation.java"		"at": "com\/android\/server\/wm\/RecentsAnimation.java"
	},		},
	"854237232": {
	"message": "addTaskToRecentsAnimationIfNeeded, control: %s, task: %s, transit: %s",
	"level": "DEBUG",
	"group": "WM_DEBUG_RECENTS_ANIMATIONS",
	"at": "com\/android\/server\/wm\/Task.java"
	},
	"873914452": {		"873914452": {
	"message": "goodToGo()",		"message": "goodToGo()",
	"level": "DEBUG",		"level": "DEBUG",

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

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -407,14 +407,6 @@ public class AppTransition implements Dump {
	return mNextAppTransitionType == NEXT_TRANSIT_TYPE_OPEN_CROSS_PROFILE_APPS;		return mNextAppTransitionType == NEXT_TRANSIT_TYPE_OPEN_CROSS_PROFILE_APPS;
	}		}

	boolean isNextAppTransitionCustomFromRecents() {
	final RecentTasks recentTasks = mService.mAtmService.getRecentTasks();
	final String recentsPackageName =
	(recentTasks != null) ? recentTasks.getRecentsComponent().getPackageName() : null;
	return mNextAppTransitionType == NEXT_TRANSIT_TYPE_CUSTOM
	&& mNextAppTransitionPackage.equals(recentsPackageName);
	}

	/**		/**
	* @return true if and only if we are currently fetching app transition specs from the future		* @return true if and only if we are currently fetching app transition specs from the future
	* passed into {@link #overridePendingAppTransitionMultiThumbFuture}		* passed into {@link #overridePendingAppTransitionMultiThumbFuture}

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

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -515,9 +515,14 @@ public class RecentsAnimationController implements DeathRecipient {

	void addTaskToTargets(Task task, OnAnimationFinishedCallback finishedCallback) {		void addTaskToTargets(Task task, OnAnimationFinishedCallback finishedCallback) {
	if (mRunner != null) {		if (mRunner != null) {
			// No need to send task appeared when the task target already exists.
			if (isAnimatingTask(task)) {
			return;
			}
	final RemoteAnimationTarget target = createTaskRemoteAnimation(task, finishedCallback);		final RemoteAnimationTarget target = createTaskRemoteAnimation(task, finishedCallback);
	if (target == null) return;		if (target == null) {
			return;
			}
	ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, "addTaskToTargets, target: %s", target);		ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS, "addTaskToTargets, target: %s", target);
	try {		try {
	mRunner.onTaskAppeared(target);		mRunner.onTaskAppeared(target);

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

+7 −6

Original line number	Original line	Diff line number	Diff line
	@@ -3511,14 +3511,15 @@ class Task extends WindowContainer<WindowContainer> {
	int transit, boolean isVoiceInteraction,		int transit, boolean isVoiceInteraction,
	@Nullable OnAnimationFinishedCallback finishedCallback) {		@Nullable OnAnimationFinishedCallback finishedCallback) {
	final RecentsAnimationController control = mWmService.getRecentsAnimationController();		final RecentsAnimationController control = mWmService.getRecentsAnimationController();
	if (control != null && enter		if (control != null) {
	&& getDisplayContent().mAppTransition.isNextAppTransitionCustomFromRecents()) {
	ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS,
	"addTaskToRecentsAnimationIfNeeded, control: %s, task: %s, transit: %s",
	control, asTask(), AppTransition.appTransitionToString(transit));
	// We let the transition to be controlled by RecentsAnimation, and callback task's		// We let the transition to be controlled by RecentsAnimation, and callback task's
	// RemoteAnimationTarget for remote runner to animate.		// RemoteAnimationTarget for remote runner to animate.
			if (enter) {
			ProtoLog.d(WM_DEBUG_RECENTS_ANIMATIONS,
			"applyAnimationUnchecked, control: %s, task: %s, transit: %s",
			control, asTask(), AppTransition.appTransitionToString(transit));
	control.addTaskToTargets(getRootTask(), finishedCallback);		control.addTaskToTargets(getRootTask(), finishedCallback);
			}
	} else {		} else {
	super.applyAnimationUnchecked(lp, enter, transit, isVoiceInteraction, finishedCallback);		super.applyAnimationUnchecked(lp, enter, transit, isVoiceInteraction, finishedCallback);
	}		}