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

Commit ebbf314c authored by James O'Leary's avatar James O'Leary Committed by Automerger Merge Worker
Browse files

Merge "Fix(?) for some disabled ChooserActivityTest cases" into tm-dev am:... 

Merge "Fix(?) for some disabled ChooserActivityTest cases" into tm-dev am: b2af0473 am: 6a72c2ef

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



Change-Id: I7e56694010673c5a6be37fde9195692c0de0d1c4
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 492fcdd0 6a72c2ef

core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java

+8 −1
Original line number Diff line number Diff line
@@ -3073,8 +3073,15 @@ public class ChooserActivityTest { 
    // framework code on the device is up-to-date.

    // TODO: is there a better way to do this? (Other than abandoning inheritance-based DI wrapper?)

    private int getRuntimeResourceId(String name, String defType) {

        int id = mActivityRule.getActivity().getResources().getIdentifier(name, defType, "android");

        int id = -1;

        if (ChooserActivityOverrideData.getInstance().resources != null) {

            id = ChooserActivityOverrideData.getInstance().resources.getIdentifier(

                  name, defType, "android");

        } else {

            id = mActivityRule.getActivity().getResources().getIdentifier(name, defType, "android");

        }

        assertThat(id, greaterThan(0));



        return id;

    }

}