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

Commit e7c7fc75 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix failing tests" into main

parents 896eda35 c947d48f

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

+4 −2
Original line number Diff line number Diff line
@@ -1258,7 +1258,8 @@ public class ResolverActivityTest { 
    @Test

    public void testTriggerFromMainProfile_inSingleUserMode_withWorkProfilePresent() {

        mSetFlagsRule.enableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE,

                android.multiuser.Flags.FLAG_ALLOW_RESOLVER_SHEET_FOR_PRIVATE_SPACE);

                android.multiuser.Flags.FLAG_ALLOW_RESOLVER_SHEET_FOR_PRIVATE_SPACE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        markWorkProfileUserAvailable();

        setTabOwnerUserHandleForLaunch(PERSONAL_USER_HANDLE);

        Intent sendIntent = createSendImageIntent();
@@ -1281,7 +1282,8 @@ public class ResolverActivityTest { 
    @Test

    public void testTriggerFromWorkProfile_inSingleUserMode() {

        mSetFlagsRule.enableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE,

                android.multiuser.Flags.FLAG_ALLOW_RESOLVER_SHEET_FOR_PRIVATE_SPACE);

                android.multiuser.Flags.FLAG_ALLOW_RESOLVER_SHEET_FOR_PRIVATE_SPACE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        markWorkProfileUserAvailable();

        setTabOwnerUserHandleForLaunch(sOverrides.workProfileUserHandle);

        Intent sendIntent = createSendImageIntent();