diff options
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 2 | ||||
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 2 | ||||
| -rw-r--r-- | core/java/android/window/WindowContextController.java | 1 | ||||
| -rw-r--r-- | core/java/android/window/WindowTokenClient.java | 1 | ||||
| -rw-r--r-- | core/java/android/window/WindowTokenClientController.java (renamed from core/java/android/app/servertransaction/WindowTokenClientController.java) | 6 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/app/activity/ActivityThreadTest.java | 2 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/window/WindowContextControllerTest.java | 1 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/window/WindowTokenClientControllerTest.java (renamed from core/tests/coretests/src/android/app/servertransaction/WindowTokenClientControllerTest.java) | 3 |
8 files changed, 7 insertions, 11 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 12ffdb37f106..8fa913253912 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -65,7 +65,6 @@ import android.app.servertransaction.PendingTransactionActions.StopInfo; import android.app.servertransaction.ResumeActivityItem; import android.app.servertransaction.TransactionExecutor; import android.app.servertransaction.TransactionExecutorHelper; -import android.app.servertransaction.WindowTokenClientController; import android.bluetooth.BluetoothFrameworkInitializer; import android.companion.virtual.VirtualDeviceManager; import android.compat.annotation.UnsupportedAppUsage; @@ -205,6 +204,7 @@ import android.window.SizeConfigurationBuckets; import android.window.SplashScreen; import android.window.SplashScreenView; import android.window.WindowProviderService; +import android.window.WindowTokenClientController; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 1f95497a7dba..5feafbed148c 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -27,7 +27,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SuppressLint; import android.annotation.UiContext; -import android.app.servertransaction.WindowTokenClientController; import android.companion.virtual.VirtualDeviceManager; import android.compat.annotation.UnsupportedAppUsage; import android.content.AttributionSource; @@ -97,6 +96,7 @@ import android.view.DisplayAdjustments; import android.view.autofill.AutofillManager.AutofillClient; import android.window.WindowContext; import android.window.WindowTokenClient; +import android.window.WindowTokenClientController; import com.android.internal.annotations.GuardedBy; import com.android.internal.util.Preconditions; diff --git a/core/java/android/window/WindowContextController.java b/core/java/android/window/WindowContextController.java index e78056e93568..99e63ec7fe02 100644 --- a/core/java/android/window/WindowContextController.java +++ b/core/java/android/window/WindowContextController.java @@ -21,7 +21,6 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; -import android.app.servertransaction.WindowTokenClientController; import android.content.Context; import android.os.Bundle; import android.os.IBinder; diff --git a/core/java/android/window/WindowTokenClient.java b/core/java/android/window/WindowTokenClient.java index c7af25bf943f..74585638df6f 100644 --- a/core/java/android/window/WindowTokenClient.java +++ b/core/java/android/window/WindowTokenClient.java @@ -25,7 +25,6 @@ import android.annotation.NonNull; import android.app.ActivityThread; import android.app.IWindowToken; import android.app.ResourcesManager; -import android.app.servertransaction.WindowTokenClientController; import android.content.Context; import android.content.res.CompatibilityInfo; import android.content.res.Configuration; diff --git a/core/java/android/app/servertransaction/WindowTokenClientController.java b/core/java/android/window/WindowTokenClientController.java index 3060ab8d7cb2..2f05f830fe09 100644 --- a/core/java/android/app/servertransaction/WindowTokenClientController.java +++ b/core/java/android/window/WindowTokenClientController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.app.servertransaction; +package android.window; import static android.view.WindowManager.LayoutParams.WindowType; import static android.view.WindowManagerGlobal.getWindowManagerService; @@ -23,6 +23,8 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.app.ActivityThread; import android.app.IApplicationThread; +import android.app.servertransaction.WindowContextConfigurationChangeItem; +import android.app.servertransaction.WindowContextWindowRemovalItem; import android.content.Context; import android.content.res.Configuration; import android.os.Bundle; @@ -31,8 +33,6 @@ import android.os.RemoteException; import android.util.ArrayMap; import android.util.Log; import android.view.IWindowManager; -import android.window.WindowContext; -import android.window.WindowTokenClient; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; diff --git a/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java b/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java index c1b55cdfc6d7..6913bf9e3cfa 100644 --- a/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java +++ b/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java @@ -49,7 +49,6 @@ import android.app.servertransaction.ConfigurationChangeItem; import android.app.servertransaction.NewIntentItem; import android.app.servertransaction.ResumeActivityItem; import android.app.servertransaction.StopActivityItem; -import android.app.servertransaction.WindowTokenClientController; import android.content.Context; import android.content.Intent; import android.content.res.CompatibilityInfo; @@ -65,6 +64,7 @@ import android.util.DisplayMetrics; import android.util.MergedConfiguration; import android.view.Display; import android.view.View; +import android.window.WindowTokenClientController; import androidx.test.filters.MediumTest; import androidx.test.platform.app.InstrumentationRegistry; diff --git a/core/tests/coretests/src/android/window/WindowContextControllerTest.java b/core/tests/coretests/src/android/window/WindowContextControllerTest.java index 5f2aecc40d16..940c06794b43 100644 --- a/core/tests/coretests/src/android/window/WindowContextControllerTest.java +++ b/core/tests/coretests/src/android/window/WindowContextControllerTest.java @@ -30,7 +30,6 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import android.app.servertransaction.WindowTokenClientController; import android.os.Binder; import android.platform.test.annotations.Presubmit; diff --git a/core/tests/coretests/src/android/app/servertransaction/WindowTokenClientControllerTest.java b/core/tests/coretests/src/android/window/WindowTokenClientControllerTest.java index 59a55bbb5c5a..9793dde0aaa5 100644 --- a/core/tests/coretests/src/android/app/servertransaction/WindowTokenClientControllerTest.java +++ b/core/tests/coretests/src/android/window/WindowTokenClientControllerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.app.servertransaction; +package android.window; import static android.view.Display.DEFAULT_DISPLAY; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY; @@ -36,7 +36,6 @@ import android.os.RemoteException; import android.platform.test.annotations.Presubmit; import android.view.IWindowManager; import android.view.WindowManagerGlobal; -import android.window.WindowTokenClient; import androidx.test.filters.SmallTest; |