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

Commit 82c5c441 authored by Ajinkya Chalke's avatar Ajinkya Chalke Committed by Automerger Merge Worker
Browse files

Merge "Ignore configComponentName_shouldResolve as it is failing for... 

Merge "Ignore configComponentName_shouldResolve as it is failing for cf_gwear_x86-userdebug." into udc-dev am: 1892bddf am: f9a79257 am: 391fea0a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22930479



Change-Id: I01002e592ed580667d38b25eecbe3b7ced543f48
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e55dfb9f 391fea0a

packages/SystemUI/tests/src/com/android/systemui/screenshot/appclips/AppClipsTrampolineActivityTest.java

+4 −0
Original line number Diff line number Diff line
@@ -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();