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

Commit 84959297 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix LauncherInstrumentation for OOP tests from gradle" into tm-qpr-dev am: 4298b36e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19865266



Change-Id: I86224b7d685f495d91c2a6245d6f1ed5462b5332
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d3502f5b 4298b36e

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

+15 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ public final class LauncherInstrumentation { 
        // Launcher package. As during inproc tests the tested launcher may not be selected as the

        // current launcher, choosing target package for inproc. For out-of-proc, use the installed

        // launcher package.

        mLauncherPackage = testPackage.equals(targetPackage)

        mLauncherPackage = testPackage.equals(targetPackage) || isGradleInstrumentation()

                ? getLauncherPackageName()

                : targetPackage;
@@ -286,6 +286,20 @@ public final class LauncherInstrumentation { 
        }

    }



    /**

     * Gradle only supports out of process instrumentation. The test package is automatically

     * generated by appending `.test` to the target package.

     */

    private boolean isGradleInstrumentation() {

        final String testPackage = getContext().getPackageName();

        final String targetPackage = mInstrumentation.getTargetContext().getPackageName();

        final String testSuffix = ".test";



        return testPackage.endsWith(testSuffix) && testPackage.length() > testSuffix.length()

            && testPackage.substring(0, testPackage.length() - testSuffix.length())

            .equals(targetPackage);

    }



    public void enableCheckEventsForSuccessfulGestures() {

        mCheckEventsForSuccessfulGestures = true;

    }