| commit | a4babe7463ffb9ea8dde1abd31eeda317c722949 | [log] [tgz] |
|---|---|---|
| author | Olivier Nshimiye <onshimiye@google.com> | Thu Mar 14 09:48:27 2024 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Mar 14 09:48:27 2024 +0000 |
| tree | db300aba8c8d267d184fc7a216116a229253e909 | |
| parent | ebeb92a4d7bed915c0af74d8029068adaf1c54ed [diff] | |
| parent | baa7a8c2c8c18cd24b78e10781ff01c39e5502b8 [diff] |
Merge "Add enable_private_space_features flag check for Private Space implementation" into main
diff --git a/src/com/android/settings/applications/credentials/DefaultCombinedPickerPrivate.java b/src/com/android/settings/applications/credentials/DefaultCombinedPickerPrivate.java index 52adc4d..f1aaa53 100644 --- a/src/com/android/settings/applications/credentials/DefaultCombinedPickerPrivate.java +++ b/src/com/android/settings/applications/credentials/DefaultCombinedPickerPrivate.java
@@ -32,6 +32,8 @@ /** 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 5abde31..0055463 100644 --- a/src/com/android/settings/datausage/lib/AppDataUsageRepository.kt +++ b/src/com/android/settings/datausage/lib/AppDataUsageRepository.kt
@@ -164,6 +164,7 @@ 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 a7be7a5..d68cf72 100644 --- a/src/com/android/settings/location/LocationForPrivateProfilePreferenceController.java +++ b/src/com/android/settings/location/LocationForPrivateProfilePreferenceController.java
@@ -68,6 +68,7 @@ @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 0fa0483..6c26186 100644 --- a/src/com/android/settings/privatespace/PrivateSpaceGaiaEducationFragment.java +++ b/src/com/android/settings/privatespace/PrivateSpaceGaiaEducationFragment.java
@@ -46,7 +46,8 @@ @Override public void onCreate(@Nullable Bundle savedInstanceState) { - if (android.os.Flags.allowPrivateProfile()) { + if (android.os.Flags.allowPrivateProfile() + && android.multiuser.Flags.enablePrivateSpaceFeatures()) { super.onCreate(savedInstanceState); } }