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

Commit f35fb717 authored by Olivier Nshimiye's avatar Olivier Nshimiye Committed by Android (Google) Code Review
Browse files

Merge "Flag cleanup for allow_resolver_sheet_for_private_space" into main

parents 34cab6d6 32e02d38

core/java/com/android/internal/app/ResolverActivity.java

+0 −1
Original line number Diff line number Diff line
@@ -2693,7 +2693,6 @@ public class ResolverActivity extends Activity implements 


    private boolean privateSpaceEnabled() {

        return mIsIntentPicker && android.os.Flags.allowPrivateProfile()

                && android.multiuser.Flags.allowResolverSheetForPrivateSpace()

                && android.multiuser.Flags.enablePrivateSpaceFeatures();

    }

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

+0 −2
Original line number Diff line number Diff line
@@ -1193,7 +1193,6 @@ public class ResolverActivityTest { 
    @Test

    public void testTriggerFromPrivateProfile_withoutWorkProfile() throws RemoteException {

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

                android.multiuser.Flags.FLAG_ALLOW_RESOLVER_SHEET_FOR_PRIVATE_SPACE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        markPrivateProfileUserAvailable();

        Intent sendIntent = createSendImageIntent();
@@ -1215,7 +1214,6 @@ public class ResolverActivityTest { 
    @Test

    public void testTriggerFromPrivateProfile_withWorkProfilePresent(){

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

                android.multiuser.Flags.FLAG_ALLOW_RESOLVER_SHEET_FOR_PRIVATE_SPACE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        ResolverActivity.ENABLE_TABBED_VIEW = false;

        markPrivateProfileUserAvailable();