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

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

Merge changes from topic "add-ps-features-flag" into main 

* changes:
  Add an additional flag guard for Private Space implementation [Services & PackageInstaller]
  Add an additional flag guard for Private Space implementation [SettingsLib & SystemUI]
parents 91e9bac3 a1e72e66

core/java/android/content/pm/LauncherApps.java

+3 −2
Original line number Diff line number Diff line
@@ -698,6 +698,7 @@ public class LauncherApps { 
        if (mUserManager.isManagedProfile()

                || (android.multiuser.Flags.enableLauncherAppsHiddenProfileChecks()

                    && android.os.Flags.allowPrivateProfile()

                    && android.multiuser.Flags.enablePrivateSpaceFeatures()

                    && mUserManager.isPrivateProfile())) {

            // If it's a managed or private profile, only return the current profile.

            final List result = new ArrayList(1);

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