Add enable_private_space_features flag check for Private Space implementation

Bug: 326060689
Test: Manual
Change-Id: I82105714e74789394a3d46b852aaa3e7b93e5877
This commit is contained in:
Olivier Nshimiye
2024-03-07 16:53:57 +00:00
parent 7dee0538d6
commit baa7a8c2c8
4 changed files with 7 additions and 2 deletions

View File

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

View File

@@ -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

View File

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

View File

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