Merge "Migrate WindowContext#onConfigurationChanged to ClientTransaction (6/n)" into main (1bf9b453) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+1 −1

core/java/android/app/ContextImpl.java

+1 −1

core/java/android/window/WindowContextController.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,6 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
	import android.annotation.IntDef;		import android.annotation.IntDef;
	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.app.servertransaction.WindowTokenClientController;
	import android.content.Context;		import android.content.Context;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.IBinder;		import android.os.IBinder;

core/java/android/window/WindowTokenClient.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,6 @@ import android.annotation.NonNull;
	import android.app.ActivityThread;		import android.app.ActivityThread;
	import android.app.IWindowToken;		import android.app.IWindowToken;
	import android.app.ResourcesManager;		import android.app.ResourcesManager;
	import android.app.servertransaction.WindowTokenClientController;
	import android.content.Context;		import android.content.Context;
	import android.content.res.CompatibilityInfo;		import android.content.res.CompatibilityInfo;
	import android.content.res.Configuration;		import android.content.res.Configuration;

core/java/android/app/servertransaction/WindowTokenClientController.java→core/java/android/window/WindowTokenClientController.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	package android.app.servertransaction;		package android.window;

	import static android.view.WindowManager.LayoutParams.WindowType;		import static android.view.WindowManager.LayoutParams.WindowType;
	import static android.view.WindowManagerGlobal.getWindowManagerService;		import static android.view.WindowManagerGlobal.getWindowManagerService;
	@@ -23,6 +23,8 @@ import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.app.ActivityThread;		import android.app.ActivityThread;
	import android.app.IApplicationThread;		import android.app.IApplicationThread;
			import android.app.servertransaction.WindowContextConfigurationChangeItem;
			import android.app.servertransaction.WindowContextWindowRemovalItem;
	import android.content.Context;		import android.content.Context;
	import android.content.res.Configuration;		import android.content.res.Configuration;
	import android.os.Bundle;		import android.os.Bundle;
	@@ -31,8 +33,6 @@ import android.os.RemoteException;
	import android.util.ArrayMap;		import android.util.ArrayMap;
	import android.util.Log;		import android.util.Log;
	import android.view.IWindowManager;		import android.view.IWindowManager;
	import android.window.WindowContext;
	import android.window.WindowTokenClient;

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