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

Merge "Don't add private profile accounts to Personal tab" into main

Browse Source
This commit is contained in:
Manish Singh
2023-11-16 09:33:41 +00:00
committed by Android (Google) Code Review
parent e43645952f 9e0437bc5b
commit 7f9a319fa9
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/accounts/AccountPreferenceController.java
View File

@@ -45,6 +45,7 @@ import android.content.pm.UserInfo;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.os.Flags;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.text.BidiFormatter; import android.text.BidiFormatter;
@@ -296,13 +297,22 @@ public class AccountPreferenceController extends AbstractPreferenceController
} else { } else {
List<UserInfo> profiles = mUm.getProfiles(UserHandle.myUserId()); List<UserInfo> profiles = mUm.getProfiles(UserHandle.myUserId());
for (UserInfo profile : profiles) { for (UserInfo profile : profiles) {
if ((profile.isManagedProfile() // Check if this controller can handle this profile - e.g. if this controller's
// mType has the WORK flag set and this profile is a managed profile.
// If there are no tabs then this controller will support all profile types -
// - ProfileType.ALL.
// At the same time we should check the user property to make sure if this profile
// should be shown or not.
if (((profile.isManagedProfile()
&& (mType & ProfileSelectFragment.ProfileType.WORK) != 0) && (mType & ProfileSelectFragment.ProfileType.WORK) != 0)
|| (profile.isPrivateProfile() || (Flags.allowPrivateProfile()
&& profile.isPrivateProfile()
&& (mType & ProfileSelectFragment.ProfileType.PRIVATE) != 0) && (mType & ProfileSelectFragment.ProfileType.PRIVATE) != 0)
|| (!profile.isManagedProfile() || (!profile.isManagedProfile()
&& !profile.isPrivateProfile() && !(Flags.allowPrivateProfile() && profile.isPrivateProfile())
&& (mType & ProfileSelectFragment.ProfileType.PERSONAL) != 0)) { && (mType & ProfileSelectFragment.ProfileType.PERSONAL) != 0))
&& !(mUm.getUserProperties(profile.getUserHandle())
.getHideInSettingsInQuietMode() && profile.isQuietModeEnabled())) {
updateProfileUi(profile); updateProfileUi(profile);
} }
} }