Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74a971e7 authored by Chris Li's avatar Chris Li
Browse files

Migrate WindowContext#onConfigurationChanged to ClientTransaction (6/n) 

Move WindowTokenClientController to /window.

Bug: 290876897
Test: Refactor only. Pass existing tests.
Change-Id: I25f294051af4715d4e75fbd3ffd99ccd11e8ccf3
parent 7a25f1bc

core/java/android/app/ActivityThread.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -65,7 +65,6 @@ import android.app.servertransaction.PendingTransactionActions.StopInfo; 
import android.app.servertransaction.ResumeActivityItem;

import android.app.servertransaction.ResumeActivityItem;

import android.app.servertransaction.TransactionExecutor;

import android.app.servertransaction.TransactionExecutor;

import android.app.servertransaction.TransactionExecutorHelper;

import android.app.servertransaction.TransactionExecutorHelper;

import android.app.servertransaction.WindowTokenClientController;

import android.bluetooth.BluetoothFrameworkInitializer;

import android.bluetooth.BluetoothFrameworkInitializer;

import android.companion.virtual.VirtualDeviceManager;

import android.companion.virtual.VirtualDeviceManager;

import android.compat.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;
@@ -205,6 +204,7 @@ import android.window.SizeConfigurationBuckets; 
import android.window.SplashScreen;

import android.window.SplashScreen;

import android.window.SplashScreenView;

import android.window.SplashScreenView;

import android.window.WindowProviderService;

import android.window.WindowProviderService;

import android.window.WindowTokenClientController;





import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

core/java/android/app/ContextImpl.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,6 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.annotation.SuppressLint;

import android.annotation.UiContext;

import android.annotation.UiContext;

import android.app.servertransaction.WindowTokenClientController;

import android.companion.virtual.VirtualDeviceManager;

import android.companion.virtual.VirtualDeviceManager;

import android.compat.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.AttributionSource;

import android.content.AttributionSource;
@@ -97,6 +96,7 @@ import android.view.DisplayAdjustments; 
import android.view.autofill.AutofillManager.AutofillClient;

import android.view.autofill.AutofillManager.AutofillClient;

import android.window.WindowContext;

import android.window.WindowContext;

import android.window.WindowTokenClient;

import android.window.WindowTokenClient;

import android.window.WindowTokenClientController;





import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.util.Preconditions;

import com.android.internal.util.Preconditions;

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;