From baa7a8c2c8c18cd24b78e10781ff01c39e5502b8 Mon Sep 17 00:00:00 2001 From: Olivier Nshimiye Date: Thu, 7 Mar 2024 16:53:57 +0000 Subject: [PATCH] Add enable_private_space_features flag check for Private Space implementation Bug: 326060689 Test: Manual Change-Id: I82105714e74789394a3d46b852aaa3e7b93e5877 --- .../credentials/DefaultCombinedPickerPrivate.java | 4 +++- .../android/settings/datausage/lib/AppDataUsageRepository.kt | 1 + .../LocationForPrivateProfilePreferenceController.java | 1 + .../privatespace/PrivateSpaceGaiaEducationFragment.java | 3 ++- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/applications/credentials/DefaultCombinedPickerPrivate.java b/src/com/android/settings/applications/credentials/DefaultCombinedPickerPrivate.java index 52adc4de2a3..f1aaa531a50 100644 --- a/src/com/android/settings/applications/credentials/DefaultCombinedPickerPrivate.java +++ b/src/com/android/settings/applications/credentials/DefaultCombinedPickerPrivate.java @@ -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(); } } diff --git a/src/com/android/settings/datausage/lib/AppDataUsageRepository.kt b/src/com/android/settings/datausage/lib/AppDataUsageRepository.kt index 5abde318c52..0055463fb27 100644 --- a/src/com/android/settings/datausage/lib/AppDataUsageRepository.kt +++ b/src/com/android/settings/datausage/lib/AppDataUsageRepository.kt @@ -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 diff --git a/src/com/android/settings/location/LocationForPrivateProfilePreferenceController.java b/src/com/android/settings/location/LocationForPrivateProfilePreferenceController.java index a7be7a50ade..d68cf7275a2 100644 --- a/src/com/android/settings/location/LocationForPrivateProfilePreferenceController.java +++ b/src/com/android/settings/location/LocationForPrivateProfilePreferenceController.java @@ -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; diff --git a/src/com/android/settings/privatespace/PrivateSpaceGaiaEducationFragment.java b/src/com/android/settings/privatespace/PrivateSpaceGaiaEducationFragment.java index 0fa04834537..6c26186f982 100644 --- a/src/com/android/settings/privatespace/PrivateSpaceGaiaEducationFragment.java +++ b/src/com/android/settings/privatespace/PrivateSpaceGaiaEducationFragment.java @@ -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); } }