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

Commit 1794eff5 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

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



Change-Id: I4552cd5e9e824e815e23333af339bb8f66ec6321
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dcd1f47a 6c389c81

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());