Merge "Don't check for correct windowing mode when exiting drag resize." (720d3a04) · Commits · e / os / android_frameworks_base

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

+7 −5

Original line number	Original line	Diff line number	Diff line
	@@ -22,10 +22,8 @@ import static android.content.pm.ActivityInfo.RESIZE_MODE_FORCE_RESIZABLE_PORTRA
	import static android.content.pm.ActivityInfo.RESIZE_MODE_FORCE_RESIZABLE_PRESERVE_ORIENTATION;		import static android.content.pm.ActivityInfo.RESIZE_MODE_FORCE_RESIZABLE_PRESERVE_ORIENTATION;
	import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET;		import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET;
	import static android.content.res.Configuration.EMPTY;		import static android.content.res.Configuration.EMPTY;

	import static com.android.server.EventLogTags.WM_TASK_REMOVED;		import static com.android.server.EventLogTags.WM_TASK_REMOVED;
	import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_STACK;
	import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
	import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
	import static com.android.server.wm.TaskProto.APP_WINDOW_TOKENS;		import static com.android.server.wm.TaskProto.APP_WINDOW_TOKENS;
	import static com.android.server.wm.TaskProto.BOUNDS;		import static com.android.server.wm.TaskProto.BOUNDS;
	import static com.android.server.wm.TaskProto.DEFER_REMOVAL;		import static com.android.server.wm.TaskProto.DEFER_REMOVAL;
	@@ -33,6 +31,9 @@ import static com.android.server.wm.TaskProto.FILLS_PARENT;
	import static com.android.server.wm.TaskProto.ID;		import static com.android.server.wm.TaskProto.ID;
	import static com.android.server.wm.TaskProto.TEMP_INSET_BOUNDS;		import static com.android.server.wm.TaskProto.TEMP_INSET_BOUNDS;
	import static com.android.server.wm.TaskProto.WINDOW_CONTAINER;		import static com.android.server.wm.TaskProto.WINDOW_CONTAINER;
			import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_STACK;
			import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
			import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;

	import android.annotation.CallSuper;		import android.annotation.CallSuper;
	import android.app.ActivityManager.TaskDescription;		import android.app.ActivityManager.TaskDescription;
	@@ -43,8 +44,8 @@ import android.util.EventLog;
	import android.util.Slog;		import android.util.Slog;
	import android.util.proto.ProtoOutputStream;		import android.util.proto.ProtoOutputStream;
	import android.view.Surface;		import android.view.Surface;

	import android.view.SurfaceControl;		import android.view.SurfaceControl;

	import com.android.internal.annotations.VisibleForTesting;		import com.android.internal.annotations.VisibleForTesting;

	import java.io.PrintWriter;		import java.io.PrintWriter;
	@@ -472,7 +473,8 @@ class Task extends WindowContainer<AppWindowToken> {

	void setDragResizing(boolean dragResizing, int dragResizeMode) {		void setDragResizing(boolean dragResizing, int dragResizeMode) {
	if (mDragResizing != dragResizing) {		if (mDragResizing != dragResizing) {
	if (!DragResizeMode.isModeAllowedForStack(mStack, dragResizeMode)) {		// No need to check if the mode is allowed if it's leaving dragResize
			if (dragResizing && !DragResizeMode.isModeAllowedForStack(mStack, dragResizeMode)) {
	throw new IllegalArgumentException("Drag resize mode not allow for stack stackId="		throw new IllegalArgumentException("Drag resize mode not allow for stack stackId="
	+ mStack.mStackId + " dragResizeMode=" + dragResizeMode);		+ mStack.mStackId + " dragResizeMode=" + dragResizeMode);
	}		}