Add RECEIVER_EXPORTED to avoid crash am: 77a08b55ae am: 4a8ccc4115 am: ebd777cd00
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TV/+/23302491
Change-Id: Ica00763b4aa4c25004c2d70800b949c6db01e4ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/common/Android.bp b/tests/common/Android.bp
index 5a65538..4e194a6 100644
--- a/tests/common/Android.bp
+++ b/tests/common/Android.bp
@@ -34,7 +34,7 @@
"tv-guava-android-jar",
"mockito-robolectric-prebuilt",
"tv-lib-truth",
- "ub-uiautomator",
+ "androidx.test.uiautomator_uiautomator",
"Robolectric_all-target",
],
diff --git a/tests/common/src/com/android/tv/testing/uihelper/BaseUiDeviceHelper.java b/tests/common/src/com/android/tv/testing/uihelper/BaseUiDeviceHelper.java
index 21b05d6..6765266 100644
--- a/tests/common/src/com/android/tv/testing/uihelper/BaseUiDeviceHelper.java
+++ b/tests/common/src/com/android/tv/testing/uihelper/BaseUiDeviceHelper.java
@@ -16,7 +16,7 @@
package com.android.tv.testing.uihelper;
import android.content.res.Resources;
-import android.support.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiDevice;
/** Base class for building UiAutomator Helper classes. */
public abstract class BaseUiDeviceHelper {
diff --git a/tests/common/src/com/android/tv/testing/uihelper/ByResource.java b/tests/common/src/com/android/tv/testing/uihelper/ByResource.java
index 47b8d9f..84527c2 100644
--- a/tests/common/src/com/android/tv/testing/uihelper/ByResource.java
+++ b/tests/common/src/com/android/tv/testing/uihelper/ByResource.java
@@ -16,8 +16,8 @@
package com.android.tv.testing.uihelper;
import android.content.res.Resources;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.BySelector;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.BySelector;
/** Convenience methods for creating {@link BySelector}s using resource ids. */
public final class ByResource {
diff --git a/tests/common/src/com/android/tv/testing/uihelper/Constants.java b/tests/common/src/com/android/tv/testing/uihelper/Constants.java
index 4b52291..d057d5f 100644
--- a/tests/common/src/com/android/tv/testing/uihelper/Constants.java
+++ b/tests/common/src/com/android/tv/testing/uihelper/Constants.java
@@ -15,8 +15,8 @@
*/
package com.android.tv.testing.uihelper;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.BySelector;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.BySelector;
import com.android.tv.common.CommonConstants;
public final class Constants {
diff --git a/tests/common/src/com/android/tv/testing/uihelper/DialogHelper.java b/tests/common/src/com/android/tv/testing/uihelper/DialogHelper.java
index 2ac4b64..e68d63a 100644
--- a/tests/common/src/com/android/tv/testing/uihelper/DialogHelper.java
+++ b/tests/common/src/com/android/tv/testing/uihelper/DialogHelper.java
@@ -21,9 +21,9 @@
import android.app.DialogFragment;
import android.content.res.Resources;
-import android.support.test.uiautomator.BySelector;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.Until;
+import androidx.test.uiautomator.BySelector;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.Until;
import com.android.tv.R;
/** Helper for testing {@link DialogFragment}s. */
diff --git a/tests/common/src/com/android/tv/testing/uihelper/LiveChannelsUiDeviceHelper.java b/tests/common/src/com/android/tv/testing/uihelper/LiveChannelsUiDeviceHelper.java
index 30fbf37..ea0a6bf 100644
--- a/tests/common/src/com/android/tv/testing/uihelper/LiveChannelsUiDeviceHelper.java
+++ b/tests/common/src/com/android/tv/testing/uihelper/LiveChannelsUiDeviceHelper.java
@@ -21,11 +21,11 @@
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.BySelector;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.Until;
import android.util.Log;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.BySelector;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.Until;
import com.android.tv.common.CommonConstants;
import com.android.tv.testing.utils.Utils;
import junit.framework.Assert;
diff --git a/tests/common/src/com/android/tv/testing/uihelper/MenuHelper.java b/tests/common/src/com/android/tv/testing/uihelper/MenuHelper.java
index c8ea85a..c9ffbd6 100644
--- a/tests/common/src/com/android/tv/testing/uihelper/MenuHelper.java
+++ b/tests/common/src/com/android/tv/testing/uihelper/MenuHelper.java
@@ -19,12 +19,12 @@
import static com.android.tv.testing.uihelper.Constants.MENU;
import android.content.res.Resources;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.BySelector;
-import android.support.test.uiautomator.Direction;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.Until;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.BySelector;
+import androidx.test.uiautomator.Direction;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject2;
+import androidx.test.uiautomator.Until;
import com.android.tv.R;
import junit.framework.Assert;
diff --git a/tests/common/src/com/android/tv/testing/uihelper/SidePanelHelper.java b/tests/common/src/com/android/tv/testing/uihelper/SidePanelHelper.java
index ba01526..d1a0651 100644
--- a/tests/common/src/com/android/tv/testing/uihelper/SidePanelHelper.java
+++ b/tests/common/src/com/android/tv/testing/uihelper/SidePanelHelper.java
@@ -17,11 +17,11 @@
package com.android.tv.testing.uihelper;
import android.content.res.Resources;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.BySelector;
-import android.support.test.uiautomator.Direction;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject2;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.BySelector;
+import androidx.test.uiautomator.Direction;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject2;
import com.android.tv.R;
import com.android.tv.ui.sidepanel.SideFragment;
import junit.framework.Assert;
diff --git a/tests/common/src/com/android/tv/testing/uihelper/UiDeviceAsserts.java b/tests/common/src/com/android/tv/testing/uihelper/UiDeviceAsserts.java
index 28ea163..2b01add 100644
--- a/tests/common/src/com/android/tv/testing/uihelper/UiDeviceAsserts.java
+++ b/tests/common/src/com/android/tv/testing/uihelper/UiDeviceAsserts.java
@@ -20,13 +20,13 @@
import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertTrue;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.BySelector;
-import android.support.test.uiautomator.Direction;
-import android.support.test.uiautomator.SearchCondition;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.Until;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.BySelector;
+import androidx.test.uiautomator.Direction;
+import androidx.test.uiautomator.SearchCondition;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject2;
+import androidx.test.uiautomator.Until;
import junit.framework.Assert;
/** Asserts for {@link UiDevice}s. */
diff --git a/tests/common/src/com/android/tv/testing/uihelper/UiDeviceUtils.java b/tests/common/src/com/android/tv/testing/uihelper/UiDeviceUtils.java
index d554502..26017d9 100644
--- a/tests/common/src/com/android/tv/testing/uihelper/UiDeviceUtils.java
+++ b/tests/common/src/com/android/tv/testing/uihelper/UiDeviceUtils.java
@@ -15,9 +15,9 @@
*/
package com.android.tv.testing.uihelper;
-import android.support.test.uiautomator.Direction;
-import android.support.test.uiautomator.UiDevice;
import android.view.KeyEvent;
+import androidx.test.uiautomator.Direction;
+import androidx.test.uiautomator.UiDevice;
/** Static utility methods for {@link UiDevice}. */
public final class UiDeviceUtils {
diff --git a/tests/common/src/com/android/tv/testing/uihelper/UiObject2Asserts.java b/tests/common/src/com/android/tv/testing/uihelper/UiObject2Asserts.java
index ee02d7f..d53bcc8 100644
--- a/tests/common/src/com/android/tv/testing/uihelper/UiObject2Asserts.java
+++ b/tests/common/src/com/android/tv/testing/uihelper/UiObject2Asserts.java
@@ -17,8 +17,8 @@
import static junit.framework.Assert.assertTrue;
-import android.support.test.uiautomator.SearchCondition;
-import android.support.test.uiautomator.UiObject2;
+import androidx.test.uiautomator.SearchCondition;
+import androidx.test.uiautomator.UiObject2;
/** Asserts for {@link UiObject2}s. */
public final class UiObject2Asserts {
diff --git a/tests/common/src/com/android/tv/testing/uihelper/UiObject2Utils.java b/tests/common/src/com/android/tv/testing/uihelper/UiObject2Utils.java
index 2f3779c..eab7081 100644
--- a/tests/common/src/com/android/tv/testing/uihelper/UiObject2Utils.java
+++ b/tests/common/src/com/android/tv/testing/uihelper/UiObject2Utils.java
@@ -16,8 +16,8 @@
package com.android.tv.testing.uihelper;
import android.graphics.Point;
-import android.support.test.uiautomator.Direction;
-import android.support.test.uiautomator.UiObject2;
+import androidx.test.uiautomator.Direction;
+import androidx.test.uiautomator.UiObject2;
/** Static utility methods for {@link UiObject2}s. */
public class UiObject2Utils {
diff --git a/tests/func/Android.bp b/tests/func/Android.bp
index d408539..befb96f 100644
--- a/tests/func/Android.bp
+++ b/tests/func/Android.bp
@@ -10,7 +10,7 @@
static_libs: [
"androidx.test.runner",
"tv-test-common",
- "ub-uiautomator",
+ "androidx.test.uiautomator_uiautomator",
],
libs: ["android.test.base.stubs"],
instrumentation_for: "LiveTv",
diff --git a/tests/func/src/com/android/tv/tests/ui/ChannelBannerViewTest.java b/tests/func/src/com/android/tv/tests/ui/ChannelBannerViewTest.java
index c06c859..e717153 100644
--- a/tests/func/src/com/android/tv/tests/ui/ChannelBannerViewTest.java
+++ b/tests/func/src/com/android/tv/tests/ui/ChannelBannerViewTest.java
@@ -16,8 +16,8 @@
package com.android.tv.tests.ui;
-import android.support.test.uiautomator.Until;
import androidx.test.filters.MediumTest;
+import androidx.test.uiautomator.Until;
import com.android.tv.R;
import com.android.tv.testing.uihelper.Constants;
import org.junit.Before;
diff --git a/tests/func/src/com/android/tv/tests/ui/ChannelSourcesTest.java b/tests/func/src/com/android/tv/tests/ui/ChannelSourcesTest.java
index 2467de2..ac40531 100644
--- a/tests/func/src/com/android/tv/tests/ui/ChannelSourcesTest.java
+++ b/tests/func/src/com/android/tv/tests/ui/ChannelSourcesTest.java
@@ -15,9 +15,9 @@
*/
package com.android.tv.tests.ui;
-import android.support.test.uiautomator.BySelector;
-import android.support.test.uiautomator.Until;
import androidx.test.filters.MediumTest;
+import androidx.test.uiautomator.BySelector;
+import androidx.test.uiautomator.Until;
import com.android.tv.R;
import com.android.tv.testing.uihelper.ByResource;
import org.junit.Before;
diff --git a/tests/func/src/com/android/tv/tests/ui/LiveChannelsAppTest.java b/tests/func/src/com/android/tv/tests/ui/LiveChannelsAppTest.java
index ac2aad4..9210508 100644
--- a/tests/func/src/com/android/tv/tests/ui/LiveChannelsAppTest.java
+++ b/tests/func/src/com/android/tv/tests/ui/LiveChannelsAppTest.java
@@ -16,9 +16,9 @@
package com.android.tv.tests.ui;
-import android.support.test.uiautomator.BySelector;
-import android.support.test.uiautomator.Until;
import androidx.test.filters.MediumTest;
+import androidx.test.uiautomator.BySelector;
+import androidx.test.uiautomator.Until;
import com.android.tv.R;
import com.android.tv.testing.testinput.ChannelStateData;
import com.android.tv.testing.testinput.TvTestInputConstants;
diff --git a/tests/func/src/com/android/tv/tests/ui/LiveChannelsTestController.java b/tests/func/src/com/android/tv/tests/ui/LiveChannelsTestController.java
index fa3335d..c3f6e73 100644
--- a/tests/func/src/com/android/tv/tests/ui/LiveChannelsTestController.java
+++ b/tests/func/src/com/android/tv/tests/ui/LiveChannelsTestController.java
@@ -23,14 +23,14 @@
import android.content.res.Resources;
import android.os.Build;
import android.os.SystemClock;
-import android.support.test.uiautomator.BySelector;
-import android.support.test.uiautomator.Configurator;
-import android.support.test.uiautomator.SearchCondition;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.Until;
import android.view.InputDevice;
import android.view.KeyEvent;
import androidx.test.InstrumentationRegistry;
+import androidx.test.uiautomator.BySelector;
+import androidx.test.uiautomator.Configurator;
+import androidx.test.uiautomator.SearchCondition;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.Until;
import com.android.tv.testing.data.ChannelInfo;
import com.android.tv.testing.testinput.ChannelStateData;
import com.android.tv.testing.testinput.TestInputControlConnection;
diff --git a/tests/func/src/com/android/tv/tests/ui/ParentalControlsTest.java b/tests/func/src/com/android/tv/tests/ui/ParentalControlsTest.java
index bff0e7d..8c26980 100644
--- a/tests/func/src/com/android/tv/tests/ui/ParentalControlsTest.java
+++ b/tests/func/src/com/android/tv/tests/ui/ParentalControlsTest.java
@@ -19,10 +19,10 @@
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertTrue;
-import android.support.test.uiautomator.BySelector;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.Until;
import androidx.test.filters.MediumTest;
+import androidx.test.uiautomator.BySelector;
+import androidx.test.uiautomator.UiObject2;
+import androidx.test.uiautomator.Until;
import com.android.tv.R;
import com.android.tv.testing.uihelper.ByResource;
import com.android.tv.testing.uihelper.DialogHelper;
diff --git a/tests/func/src/com/android/tv/tests/ui/PlayControlsRowViewTest.java b/tests/func/src/com/android/tv/tests/ui/PlayControlsRowViewTest.java
index e24c72f..e129ad9 100644
--- a/tests/func/src/com/android/tv/tests/ui/PlayControlsRowViewTest.java
+++ b/tests/func/src/com/android/tv/tests/ui/PlayControlsRowViewTest.java
@@ -22,11 +22,11 @@
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotNull;
-import android.support.test.uiautomator.BySelector;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.Until;
import android.view.KeyEvent;
import androidx.test.filters.SmallTest;
+import androidx.test.uiautomator.BySelector;
+import androidx.test.uiautomator.UiObject2;
+import androidx.test.uiautomator.Until;
import com.android.tv.R;
import com.android.tv.testing.testinput.TvTestInputConstants;
import com.android.tv.testing.uihelper.Constants;
diff --git a/tests/func/src/com/android/tv/tests/ui/ProgramGuideTest.java b/tests/func/src/com/android/tv/tests/ui/ProgramGuideTest.java
index 0a6a85d..0a8fa62 100644
--- a/tests/func/src/com/android/tv/tests/ui/ProgramGuideTest.java
+++ b/tests/func/src/com/android/tv/tests/ui/ProgramGuideTest.java
@@ -15,8 +15,8 @@
*/
package com.android.tv.tests.ui;
-import android.support.test.uiautomator.Until;
import androidx.test.filters.MediumTest;
+import androidx.test.uiautomator.Until;
import com.android.tv.guide.ProgramGuide;
import com.android.tv.testing.uihelper.Constants;
import org.junit.Rule;
diff --git a/tests/func/src/com/android/tv/tests/ui/TimeoutTest.java b/tests/func/src/com/android/tv/tests/ui/TimeoutTest.java
index 73e869f..7d37140 100644
--- a/tests/func/src/com/android/tv/tests/ui/TimeoutTest.java
+++ b/tests/func/src/com/android/tv/tests/ui/TimeoutTest.java
@@ -15,8 +15,8 @@
*/
package com.android.tv.tests.ui;
-import android.support.test.uiautomator.Until;
import androidx.test.filters.LargeTest;
+import androidx.test.uiautomator.Until;
import com.android.tv.R;
import com.android.tv.testing.uihelper.Constants;
import org.junit.Ignore;
diff --git a/tests/func/src/com/android/tv/tests/ui/dvr/DvrLibraryTest.java b/tests/func/src/com/android/tv/tests/ui/dvr/DvrLibraryTest.java
index 8998b45..359fd1d 100644
--- a/tests/func/src/com/android/tv/tests/ui/dvr/DvrLibraryTest.java
+++ b/tests/func/src/com/android/tv/tests/ui/dvr/DvrLibraryTest.java
@@ -19,11 +19,11 @@
import static com.android.tv.testing.uihelper.UiDeviceAsserts.assertWaitUntilFocused;
import android.os.Build;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.BySelector;
-import android.support.test.uiautomator.Until;
import androidx.test.filters.MediumTest;
import androidx.test.filters.SdkSuppress;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.BySelector;
+import androidx.test.uiautomator.Until;
import com.android.tv.R;
import com.android.tv.testing.uihelper.ByResource;
import com.android.tv.testing.uihelper.Constants;
diff --git a/tests/func/src/com/android/tv/tests/ui/sidepanel/CustomizeChannelListFragmentTest.java b/tests/func/src/com/android/tv/tests/ui/sidepanel/CustomizeChannelListFragmentTest.java
index d035874..3ee2ad0 100644
--- a/tests/func/src/com/android/tv/tests/ui/sidepanel/CustomizeChannelListFragmentTest.java
+++ b/tests/func/src/com/android/tv/tests/ui/sidepanel/CustomizeChannelListFragmentTest.java
@@ -21,11 +21,11 @@
import static junit.framework.Assert.assertTrue;
import android.graphics.Point;
-import android.support.test.uiautomator.BySelector;
-import android.support.test.uiautomator.Direction;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.Until;
import androidx.test.filters.MediumTest;
+import androidx.test.uiautomator.BySelector;
+import androidx.test.uiautomator.Direction;
+import androidx.test.uiautomator.UiObject2;
+import androidx.test.uiautomator.Until;
import com.android.tv.R;
import com.android.tv.testing.uihelper.Constants;
import com.android.tv.tests.ui.LiveChannelsTestController;
diff --git a/tests/jank/Android.bp b/tests/jank/Android.bp
index 1cea734..a16e38e 100644
--- a/tests/jank/Android.bp
+++ b/tests/jank/Android.bp
@@ -9,9 +9,9 @@
srcs: ["src/**/*.java"],
static_libs: [
"androidx.test.runner",
+ "androidx.test.uiautomator_uiautomator",
"tv-test-common",
"ub-janktesthelper",
- "ub-uiautomator",
],
libs: ["android.test.base.stubs"],
instrumentation_for: "LiveTv",
diff --git a/tests/jank/src/com/android/tv/tests/jank/LiveChannelsTestCase.java b/tests/jank/src/com/android/tv/tests/jank/LiveChannelsTestCase.java
index 507e9dd..602aa53 100644
--- a/tests/jank/src/com/android/tv/tests/jank/LiveChannelsTestCase.java
+++ b/tests/jank/src/com/android/tv/tests/jank/LiveChannelsTestCase.java
@@ -17,7 +17,7 @@
import android.content.res.Resources;
import android.support.test.jank.JankTestBase;
-import android.support.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiDevice;
import com.android.tv.testing.uihelper.LiveChannelsUiDeviceHelper;
/** Base test case for LiveChannel jank tests. */
diff --git a/tests/jank/src/com/android/tv/tests/jank/ProgramGuideJankTest.java b/tests/jank/src/com/android/tv/tests/jank/ProgramGuideJankTest.java
index da2eb9c..3baf455 100644
--- a/tests/jank/src/com/android/tv/tests/jank/ProgramGuideJankTest.java
+++ b/tests/jank/src/com/android/tv/tests/jank/ProgramGuideJankTest.java
@@ -19,8 +19,8 @@
import android.support.test.jank.GfxMonitor;
import android.support.test.jank.JankTest;
-import android.support.test.uiautomator.Until;
import androidx.test.filters.MediumTest;
+import androidx.test.uiautomator.Until;
import com.android.tv.R;
import com.android.tv.testing.uihelper.ByResource;
import com.android.tv.testing.uihelper.Constants;
diff --git a/tests/jank/src/com/android/tv/tests/jank/Utils.java b/tests/jank/src/com/android/tv/tests/jank/Utils.java
index 57e5f10..c1828ec 100644
--- a/tests/jank/src/com/android/tv/tests/jank/Utils.java
+++ b/tests/jank/src/com/android/tv/tests/jank/Utils.java
@@ -15,7 +15,7 @@
*/
package com.android.tv.tests.jank;
-import android.support.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiDevice;
import com.android.tv.testing.uihelper.UiDeviceUtils;
public final class Utils {
diff --git a/tuner/tests/testing/Android.mk b/tuner/tests/testing/Android.mk
index 38f7342..2d80002 100644
--- a/tuner/tests/testing/Android.mk
+++ b/tuner/tests/testing/Android.mk
@@ -12,7 +12,7 @@
tv-guava-android-jar \
mockito-robolectric-prebuilt \
tv-lib-truth \
- ub-uiautomator \
+ androidx.test.uiautomator_uiautomator \
# Link tv-common as shared library to avoid the problem of initialization of the constants
LOCAL_JAVA_LIBRARIES := tv-common
