From b93ee9bcfa9848340eccd974a9f456af1f82779c Mon Sep 17 00:00:00 2001
From: Eric Lin <ericth@google.com>
Date: Mon, 29 Jul 2024 10:51:00 +0800
Subject: Replace deprecated AndroidJUnit4.

AndroidJUnit4 from `androidx.test.runner` is deprecated, use
`androidx.test.ext.junit.runners.AndroidJUnit4` instead. See https://
developer.android.com/reference/androidx/test/runner/AndroidJUnit4 for
more details.

Bug: 354063239
Test: atest FrameworksCoreTests:DecorContextTest FrameworksCoreTests:PhoneWindowTest
Flag: TEST_ONLY
Change-Id: I3aa3f9ad7edeb328cd7d007ea74c66ad1f80d06e
---
 .../coretests/src/com/android/internal/policy/DecorContextTest.java     | 2 +-
 .../coretests/src/com/android/internal/policy/PhoneWindowTest.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/tests/coretests/src/com/android/internal/policy/DecorContextTest.java b/core/tests/coretests/src/com/android/internal/policy/DecorContextTest.java
index 7f4e9ada7b22..2f3b7f968a61 100644
--- a/core/tests/coretests/src/com/android/internal/policy/DecorContextTest.java
+++ b/core/tests/coretests/src/com/android/internal/policy/DecorContextTest.java
@@ -36,9 +36,9 @@ import android.view.WindowManager;
 import android.view.WindowManagerImpl;
 
 import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/core/tests/coretests/src/com/android/internal/policy/PhoneWindowTest.java b/core/tests/coretests/src/com/android/internal/policy/PhoneWindowTest.java
index 4921e4a4a061..e037f2acd16d 100644
--- a/core/tests/coretests/src/com/android/internal/policy/PhoneWindowTest.java
+++ b/core/tests/coretests/src/com/android/internal/policy/PhoneWindowTest.java
@@ -44,8 +44,8 @@ import android.view.ViewRootImpl;
 import android.view.WindowManager;
 
 import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import com.android.frameworks.coretests.R;
 
-- 
cgit v1.2.3-59-g8ed1b