From fcafdcffb0815f83362bb598c12ed35eab0f2b47 Mon Sep 17 00:00:00 2001
From: Olivier Nshimiye <onshimiye@google.com>
Date: Wed, 25 Oct 2023 16:05:04 +0000
Subject: [PATCH] Update the getHideInSettingsInQuietMode to
 getHideInUiInQuietMode

Bug: 307515481
Test: manual
Change-Id: I75996df11e9276eff5c388b509d630a0d4b3d39f
---
 src/com/android/settings/Utils.java                           | 4 +++-
 .../settings/accounts/AccountPreferenceController.java        | 4 +++-
 .../dashboard/profileselector/ProfileSelectDialog.java        | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 2113b5d2c62..054fe886d34 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -1267,7 +1267,9 @@ public final class Utils extends com.android.settingslib.Utils {
         for (UserHandle userHandle : profiles) {
             UserProperties userProperties = userManager.getUserProperties(userHandle);
             if (userProperties.getShowInSettings() == UserProperties.SHOW_IN_SETTINGS_SEPARATE) {
-                if (Flags.allowPrivateProfile() && userProperties.getHideInSettingsInQuietMode()) {
+                if (Flags.allowPrivateProfile()
+                        && userProperties.getShowInQuietMode()
+                        == UserProperties.SHOW_IN_QUIET_MODE_HIDDEN) {
                     if (!userManager.isQuietModeEnabled(userHandle)) {
                         return true;
                     } else {
diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java
index b2cdb777a10..3e6feb74094 100644
--- a/src/com/android/settings/accounts/AccountPreferenceController.java
+++ b/src/com/android/settings/accounts/AccountPreferenceController.java
@@ -42,6 +42,7 @@ import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.UserInfo;
+import android.content.pm.UserProperties;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ -312,7 +313,8 @@ public class AccountPreferenceController extends AbstractPreferenceController
                             && !(Flags.allowPrivateProfile() && profile.isPrivateProfile())
                             && (mType & ProfileSelectFragment.ProfileType.PERSONAL) != 0))
                         && !(mUm.getUserProperties(profile.getUserHandle())
-                            .getHideInSettingsInQuietMode() && profile.isQuietModeEnabled())) {
+                            .getShowInQuietMode() == UserProperties.SHOW_IN_QUIET_MODE_HIDDEN
+                            && profile.isQuietModeEnabled())) {
                     updateProfileUi(profile);
                 }
             }
diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectDialog.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectDialog.java
index 561a51ae84d..eaad7f39944 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectDialog.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectDialog.java
@@ -235,7 +235,7 @@ public class ProfileSelectDialog extends DialogFragment implements UserAdapter.O
     private static boolean shouldHideUserInQuietMode(
             UserHandle userHandle, UserManager userManager) {
         UserProperties userProperties = userManager.getUserProperties(userHandle);
-        return userProperties.getHideInSettingsInQuietMode()
+        return userProperties.getShowInQuietMode() == UserProperties.SHOW_IN_QUIET_MODE_HIDDEN
                 && userManager.isQuietModeEnabled(userHandle);
     }
 }