Merge cherrypicks of [18130745, 18204686] into tm-release. (7ab41bf3) · Commits · e / os / android_frameworks_base

data/etc/services.core.protolog.json

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -2485,12 +2485,6 @@
	"group": "WM_ERROR",		"group": "WM_ERROR",
	"at": "com\/android\/server\/wm\/WindowManagerService.java"		"at": "com\/android\/server\/wm\/WindowManagerService.java"
	},		},
	"323235828": {
	"message": "Delaying app transition for recents animation to finish",
	"level": "VERBOSE",
	"group": "WM_DEBUG_APP_TRANSITIONS",
	"at": "com\/android\/server\/wm\/AppTransitionController.java"
	},
	"327461496": {		"327461496": {
	"message": "Complete pause: %s",		"message": "Complete pause: %s",
	"level": "VERBOSE",		"level": "VERBOSE",

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsDialogMeasureAdapter.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -154,7 +154,9 @@ public class UdfpsDialogMeasureAdapter {

	//re-calculate the height of description		//re-calculate the height of description
	View description = mView.findViewById(R.id.description);		View description = mView.findViewById(R.id.description);
			if (description != null && description.getVisibility() != View.GONE) {
	totalHeight += measureDescription(description, displayHeight, width, totalHeight);		totalHeight += measureDescription(description, displayHeight, width, totalHeight);
			}

	return new AuthDialog.LayoutParams(width, totalHeight);		return new AuthDialog.LayoutParams(width, totalHeight);
	}		}

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

+1 −6

Original line number	Original line	Diff line number	Diff line
	@@ -68,7 +68,6 @@ import static com.android.server.wm.AppTransition.isNormalTransit;
	import static com.android.server.wm.NonAppWindowAnimationAdapter.shouldAttachNavBarToApp;		import static com.android.server.wm.NonAppWindowAnimationAdapter.shouldAttachNavBarToApp;
	import static com.android.server.wm.NonAppWindowAnimationAdapter.shouldStartNonAppWindowAnimationsForKeyguardExit;		import static com.android.server.wm.NonAppWindowAnimationAdapter.shouldStartNonAppWindowAnimationsForKeyguardExit;
	import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION;		import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION;
	import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_RECENTS;
	import static com.android.server.wm.WallpaperAnimationAdapter.shouldStartWallpaperAnimation;		import static com.android.server.wm.WallpaperAnimationAdapter.shouldStartWallpaperAnimation;
	import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS;		import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS;
	import static com.android.server.wm.WindowManagerDebugConfig.SHOW_LIGHT_TRANSACTIONS;		import static com.android.server.wm.WindowManagerDebugConfig.SHOW_LIGHT_TRANSACTIONS;
	@@ -1143,17 +1142,13 @@ public class AppTransitionController {
	if (activity == null) {		if (activity == null) {
	continue;		continue;
	}		}
	if (activity.isAnimating(PARENTS, ANIMATION_TYPE_RECENTS)) {
	ProtoLog.v(WM_DEBUG_APP_TRANSITIONS,
	"Delaying app transition for recents animation to finish");
	return false;
	}
	ProtoLog.v(WM_DEBUG_APP_TRANSITIONS,		ProtoLog.v(WM_DEBUG_APP_TRANSITIONS,
	"Check opening app=%s: allDrawn=%b startingDisplayed=%b "		"Check opening app=%s: allDrawn=%b startingDisplayed=%b "
	+ "startingMoved=%b isRelaunching()=%b startingWindow=%s",		+ "startingMoved=%b isRelaunching()=%b startingWindow=%s",
	activity, activity.allDrawn, activity.startingDisplayed,		activity, activity.allDrawn, activity.startingDisplayed,
	activity.startingMoved, activity.isRelaunching(),		activity.startingMoved, activity.isRelaunching(),
	activity.mStartingWindow);		activity.mStartingWindow);

	final boolean allDrawn = activity.allDrawn && !activity.isRelaunching();		final boolean allDrawn = activity.allDrawn && !activity.isRelaunching();
	if (!allDrawn && !activity.startingDisplayed && !activity.startingMoved) {		if (!allDrawn && !activity.startingDisplayed && !activity.startingMoved) {
	return false;		return false;

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

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -1584,14 +1584,6 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
	return true;		return true;
	}		}

	void forAllWindowContainers(Consumer<WindowContainer> callback) {
	callback.accept(this);
	final int count = mChildren.size();
	for (int i = 0; i < count; i++) {
	mChildren.get(i).forAllWindowContainers(callback);
	}
	}

	/**		/**
	* For all windows at or below this container call the callback.		* For all windows at or below this container call the callback.
	* @param callback Calls the {@link ToBooleanFunction#apply} method for each window found and		* @param callback Calls the {@link ToBooleanFunction#apply} method for each window found and

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

+2 −12

Original line number	Original line	Diff line number	Diff line
	@@ -118,7 +118,6 @@ import static com.android.server.wm.DisplayContent.IME_TARGET_CONTROL;
	import static com.android.server.wm.DisplayContent.IME_TARGET_LAYERING;		import static com.android.server.wm.DisplayContent.IME_TARGET_LAYERING;
	import static com.android.server.wm.RootWindowContainer.MATCH_ATTACHED_TASK_OR_RECENT_TASKS;		import static com.android.server.wm.RootWindowContainer.MATCH_ATTACHED_TASK_OR_RECENT_TASKS;
	import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_ALL;		import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_ALL;
	import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION;
	import static com.android.server.wm.WindowContainer.AnimationFlags.CHILDREN;		import static com.android.server.wm.WindowContainer.AnimationFlags.CHILDREN;
	import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION;		import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION;
	import static com.android.server.wm.WindowManagerDebugConfig.DEBUG;		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG;
	@@ -3051,22 +3050,13 @@ public class WindowManagerService extends IWindowManager.Stub
	}		}
	}		}


	void cleanupRecentsAnimation(@RecentsAnimationController.ReorderMode int reorderMode) {		void cleanupRecentsAnimation(@RecentsAnimationController.ReorderMode int reorderMode) {
	if (mRecentsAnimationController != null) {		if (mRecentsAnimationController != null) {
	final RecentsAnimationController controller = mRecentsAnimationController;		final RecentsAnimationController controller = mRecentsAnimationController;
	mRecentsAnimationController = null;		mRecentsAnimationController = null;
	controller.cleanupAnimation(reorderMode);		controller.cleanupAnimation(reorderMode);
	// TODO(multi-display): currently only default display support recents animation.		// TODO(mult-display): currently only default display support recents animation.
	// Cancel any existing app transition animation running in the legacy transition		getDefaultDisplayContentLocked().mAppTransition.updateBooster();
	// framework.
	final DisplayContent dc = getDefaultDisplayContentLocked();
	dc.mAppTransition.freeze();
	dc.forAllWindowContainers((wc) -> {
	if (wc.isAnimating(TRANSITION, ANIMATION_TYPE_APP_TRANSITION)) {
	wc.cancelAnimation();
	}
	});
	}		}
	}		}