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

Commit abbfff37 authored by Olivier Nshimiye's avatar Olivier Nshimiye
Browse files

Add an additional flag guard for Private Space implementation 

[SettingsLib & SystemUI]

This a layer of flag guarding only for the implementation of Private Space features excluding the APIs. The MVP flag allow_private_profile still guards all the features including the APIs.

Bug: 326060689
Test: Manual - a few verifications that some feeatures are unavailable when this flag is disabled
Test: Run presubmits and verify that nothing breaks

Change-Id: I61acf8fe98756cb1055fa4f554fc37517c5342da
parent 414c9bb2

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

+2 −1
Original line number Diff line number Diff line
@@ -2655,7 +2655,8 @@ public class ResolverActivity extends Activity implements 


    private boolean privateSpaceEnabled() {

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

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

                && android.multiuser.Flags.allowResolverSheetForPrivateSpace()

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

    }



    /**

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

+2 −1
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ public class SetScreenLockDialogActivity extends AlertActivity 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        if (!(android.os.Flags.allowPrivateProfile()

                && android.multiuser.Flags.showSetScreenLockDialog())) {

                && android.multiuser.Flags.showSetScreenLockDialog()

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

            finish();

            return;

        }

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

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ public class UnlaunchableAppActivity extends Activity 
        }



        if (android.os.Flags.allowPrivateProfile()

                && android.multiuser.Flags.enablePrivateSpaceFeatures()

                && !userManager.isManagedProfile(mUserId)) {

            Log.e(TAG, "Unlaunchable activity for target package " + targetPackageName

                    + " called for a non-managed-profile " + mUserId);

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

+8 −4
Original line number Diff line number Diff line
@@ -1162,7 +1162,8 @@ 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_ALLOW_RESOLVER_SHEET_FOR_PRIVATE_SPACE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        markPrivateProfileUserAvailable();

        Intent sendIntent = createSendImageIntent();

        List<ResolvedComponentInfo> privateResolvedComponentInfos =
@@ -1183,7 +1184,8 @@ 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_ALLOW_RESOLVER_SHEET_FOR_PRIVATE_SPACE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        ResolverActivity.ENABLE_TABBED_VIEW = false;

        markPrivateProfileUserAvailable();

        markWorkProfileUserAvailable();
@@ -1205,7 +1207,8 @@ public class ResolverActivityTest { 
    @Test

    public void testPrivateProfile_triggerFromPrimaryUser_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);

        markPrivateProfileUserAvailable();

        markWorkProfileUserAvailable();

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

    public void testPrivateProfile_triggerFromWorkProfile(){

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

        markPrivateProfileUserAvailable();

        markWorkProfileUserAvailable();

        Intent sendIntent = createSendImageIntent();

packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java

+1 −0
Original line number Diff line number Diff line
@@ -1703,6 +1703,7 @@ public class ApplicationsState { 


        public boolean isPrivateProfile() {

            return android.os.Flags.allowPrivateProfile()

                    && android.multiuser.Flags.enablePrivateSpaceFeatures()

                    && UserManager.USER_TYPE_PROFILE_PRIVATE.equals(mProfileType);

        }