commit 24be6a897f7e72dbee4fa5cfacf462a7cf9804f0
author Prabal Singh <prabalsingh@google.com> Tue Jan 31 17:10:20 2023 +0000
committer Prabal Singh <prabalsingh@google.com> Wed Feb 01 14:28:27 2023 +0000
tree 2afcf1f92c1bebf220fc818e64e691b71430be70
parent 258ed5b6a9380265caf2459de31994c280439d2d

Quiet mode should not affect the overall status

Test: manually tested
Bug: 243802915
Change-Id: Ic9b882e4fe9cf3ace3ddb6a0c0d3893218136d24

service/java/com/android/safetycenter/SafetyCenterDataFactory.java

diff --git a/service/java/com/android/safetycenter/SafetyCenterDataFactory.java b/service/java/com/android/safetycenter/SafetyCenterDataFactory.java
index ace1ac4..2ab380f 100644
--- a/service/java/com/android/safetycenter/SafetyCenterDataFactory.java
+++ b/service/java/com/android/safetycenter/SafetyCenterDataFactory.java
@@ -565,10 +565,14 @@
                                 mSafetySourceDataRepository.getSafetySourceDataInternal(key));
                 boolean defaultEntryDueToQuietMode = isUserManaged && !isManagedUserRunning;
                 if (safetySourceStatus == null || defaultEntryDueToQuietMode) {
+                    int severityLevel =
+                            defaultEntryDueToQuietMode
+                                    ? SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_UNSPECIFIED
+                                    : SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_UNKNOWN;
                     return toDefaultSafetyCenterEntry(
                             safetySource,
                             safetySource.getPackageName(),
-                            SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_UNKNOWN,
+                            severityLevel,
                             SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION,
                             userId,
                             isUserManaged,
@@ -762,11 +766,10 @@
         if (staticEntry == null) {
             return;
         }
-        boolean isQuietModeEnabled = isUserManaged && !isManagedUserRunning;
         boolean hasError =
                 mSafetySourceDataRepository.sourceHasError(
                         SafetySourceKey.of(safetySource.getId(), userId));
-        if (isQuietModeEnabled || hasError) {
+        if (hasError) {
             safetyCenterOverallState.addEntryOverallSeverityLevel(
                     SafetyCenterStatus.OVERALL_SEVERITY_LEVEL_UNKNOWN);
         }