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

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

Merge "Add enable_private_space_features flag check for Private Space implementation" into main

parents ebeb92a4 baa7a8c2

src/com/android/settings/applications/credentials/DefaultCombinedPickerPrivate.java

+3 −1
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ public class DefaultCombinedPickerPrivate extends DefaultCombinedPicker { 


    /** Returns whether the user is handled by this fragment. */

    public static boolean isUserHandledByFragment(UserManager userManager) {

        return android.os.Flags.allowPrivateProfile() && userManager.isPrivateProfile();

        return android.os.Flags.allowPrivateProfile()

                && android.multiuser.Flags.enablePrivateSpaceFeatures()

                && userManager.isPrivateProfile();

    }

}

src/com/android/settings/datausage/lib/AppDataUsageRepository.kt

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ class AppDataUsageRepository( 


    private fun shouldSkipProfile(userManager : UserManager, userHandle: UserHandle): Boolean {

        if (android.os.Flags.allowPrivateProfile()

                && android.multiuser.Flags.enablePrivateSpaceFeatures()

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

            return (userManager.isQuietModeEnabled(userHandle)

                    && userManager.getUserProperties(userHandle).showInQuietMode

src/com/android/settings/location/LocationForPrivateProfilePreferenceController.java

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ public class LocationForPrivateProfilePreferenceController 
    @Override

    public int getAvailabilityStatus() {

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

                || !android.multiuser.Flags.enablePrivateSpaceFeatures()

                || !android.multiuser.Flags.handleInterleavedSettingsForPrivateSpace()

                || !isPrivateProfileAvailable()) {

            return CONDITIONALLY_UNAVAILABLE;

src/com/android/settings/privatespace/PrivateSpaceGaiaEducationFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ public class PrivateSpaceGaiaEducationFragment extends InstrumentedFragment { 


    @Override

    public void onCreate(@Nullable Bundle savedInstanceState) {

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

        if (android.os.Flags.allowPrivateProfile()

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

            super.onCreate(savedInstanceState);

        }

    }