PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Olivier Nshimiye
2024-03-14 09:48:27 +00:00
committed by Android (Google) Code Review
parent ebeb92a4d7 baa7a8c2c8
commit a4babe7463
4 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/applications/credentials/DefaultCombinedPickerPrivate.java
View File

@@ -32,6 +32,8 @@ public class DefaultCombinedPickerPrivate extends DefaultCombinedPicker {
/** Returns whether the user is handled by this fragment. */ /** Returns whether the user is handled by this fragment. */
public static boolean isUserHandledByFragment(UserManager userManager) { public static boolean isUserHandledByFragment(UserManager userManager) {
return android.os.Flags.allowPrivateProfile() && userManager.isPrivateProfile(); return android.os.Flags.allowPrivateProfile()
&& android.multiuser.Flags.enablePrivateSpaceFeatures()
&& userManager.isPrivateProfile();
} }
} }

1
src/com/android/settings/datausage/lib/AppDataUsageRepository.kt
View File

@@ -164,6 +164,7 @@ class AppDataUsageRepository(
private fun shouldSkipProfile(userManager : UserManager, userHandle: UserHandle): Boolean { private fun shouldSkipProfile(userManager : UserManager, userHandle: UserHandle): Boolean {
if (android.os.Flags.allowPrivateProfile() if (android.os.Flags.allowPrivateProfile()
&& android.multiuser.Flags.enablePrivateSpaceFeatures()
&& android.multiuser.Flags.handleInterleavedSettingsForPrivateSpace()) { && android.multiuser.Flags.handleInterleavedSettingsForPrivateSpace()) {
return (userManager.isQuietModeEnabled(userHandle) return (userManager.isQuietModeEnabled(userHandle)
&& userManager.getUserProperties(userHandle).showInQuietMode && userManager.getUserProperties(userHandle).showInQuietMode

1
src/com/android/settings/location/LocationForPrivateProfilePreferenceController.java
View File

@@ -68,6 +68,7 @@ public class LocationForPrivateProfilePreferenceController
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
if (!android.os.Flags.allowPrivateProfile() if (!android.os.Flags.allowPrivateProfile()
|| !android.multiuser.Flags.enablePrivateSpaceFeatures()
|| !android.multiuser.Flags.handleInterleavedSettingsForPrivateSpace() || !android.multiuser.Flags.handleInterleavedSettingsForPrivateSpace()
|| !isPrivateProfileAvailable()) { || !isPrivateProfileAvailable()) {
return CONDITIONALLY_UNAVAILABLE; return CONDITIONALLY_UNAVAILABLE;

3
src/com/android/settings/privatespace/PrivateSpaceGaiaEducationFragment.java
View File

@@ -46,7 +46,8 @@ public class PrivateSpaceGaiaEducationFragment extends InstrumentedFragment {
@Override @Override
public void onCreate(@Nullable Bundle savedInstanceState) { public void onCreate(@Nullable Bundle savedInstanceState) {
if (android.os.Flags.allowPrivateProfile()) { if (android.os.Flags.allowPrivateProfile()
&& android.multiuser.Flags.enablePrivateSpaceFeatures()) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
} }
} }