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

Commit d1bb27e9 authored by Sam Lin's avatar Sam Lin Committed by Automerger Merge Worker
Browse files

Merge "Rename to BASE_CLS_TO_INCLUDE, etc. as Android's inclusive language... 

Merge "Rename to BASE_CLS_TO_INCLUDE, etc. as Android's inclusive language guidance" into udc-dev am: 5ea89d53

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



Change-Id: Ibbc2ee689d4db81cd03eae3b966ac4dae9e06498
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c1fa7d21 5ea89d53

packages/SystemUI/tests/src/com/android/AAAPlusPlusVerifySysuiRequiredTestPropertiesTest.java

+4 −4
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class AAAPlusPlusVerifySysuiRequiredTestPropertiesTest extends SysuiTestC 


    private static final String TAG = "AAA++VerifyTest";



    private static final Class[] BASE_CLS_WHITELIST = {

    private static final Class[] BASE_CLS_TO_INCLUDE = {

            SysuiTestCase.class,

            SysuiBaseFragmentTest.class,

    };
@@ -81,7 +81,7 @@ public class AAAPlusPlusVerifySysuiRequiredTestPropertiesTest extends SysuiTestC 
            if (!isTestClass(cls)) continue;



            boolean hasParent = false;

            for (Class<?> parent : BASE_CLS_WHITELIST) {

            for (Class<?> parent : BASE_CLS_TO_INCLUDE) {

                if (parent.isAssignableFrom(cls)) {

                    hasParent = true;

                    break;
@@ -131,13 +131,13 @@ public class AAAPlusPlusVerifySysuiRequiredTestPropertiesTest extends SysuiTestC 
        // with the main process dependency graph because it will not exist

        // at runtime and could lead to incorrect tests which assume

        // the main SystemUI process. Therefore, exclude this package

        // from the base class whitelist.

        // from the base class allowlist.

        filter.add(s -> !s.startsWith("com.android.systemui.screenshot"));

        return filter;

    }



    private String getClsStr() {

        return TextUtils.join(",", Arrays.asList(BASE_CLS_WHITELIST)

        return TextUtils.join(",", Arrays.asList(BASE_CLS_TO_INCLUDE)

                .stream().map(cls -> cls.getSimpleName()).toArray());

    }