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

Commit 40c580e2 authored by Vali Calinescu's avatar Vali Calinescu Committed by Automerger Merge Worker
Browse files

Merge "Clean up transparent activity test in SizeCompatTests" into tm-qpr-dev... 

Merge "Clean up transparent activity test in SizeCompatTests" into tm-qpr-dev am: e05c0032 am: 6c389c81 am: 1794eff5

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



Change-Id: I9aea449eb68beb3666e7b0932ac885b16c95d365
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 09bec871 1794eff5

services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ public class SizeCompatTests extends WindowTestsBase { 
                .setLaunchedFromUid(mActivity.getUid())

                .setScreenOrientation(SCREEN_ORIENTATION_PORTRAIT)

                .build();

        doReturn(true).when(translucentActivity).fillsParent();

        doReturn(false).when(translucentActivity).fillsParent();

        mTask.addChild(translucentActivity);

        // It should not be in SCM

        assertFalse(translucentActivity.inSizeCompatMode());