Merge "Ignore configComponentName_shouldResolve as it is failing for cf_gwear_x86-userdebug." into udc-dev am: 1892bddf99
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22930479 Change-Id: Ia017235477e48f5c7ee8f074ab9dc673642b4be4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -30,6 +30,7 @@ import static com.android.systemui.screenshot.appclips.AppClipsTrampolineActivit
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.junit.Assume.assumeFalse;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyInt;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
@@ -127,6 +128,9 @@ public final class AppClipsTrampolineActivityTest extends SysuiTestCase {
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
assumeFalse("Skip test: does not apply to watches",
|
||||
mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH));
|
||||
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mMainHandler = mContext.getMainThreadHandler();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user