summaryrefslogtreecommitdiff
path: root/PermissionController/src/com/android
diff options
context:
space:
mode:
authorElliot Sisteron <elliotsisteron@google.com>2023-08-15 12:49:32 +0000
committerElliot Sisteron <elliotsisteron@google.com>2023-08-15 15:52:43 +0000
commit9fe140c90726b7a41e4161e7da3b0ee6edc02196 (patch)
tree3f9c84bda9150a1272a72247f65f0e5efc39242e /PermissionController/src/com/android
parent76355cecff79c13e0820416a8de8b7038bd20be9 (diff)
downloadPermission-9fe140c90726b7a41e4161e7da3b0ee6edc02196.tar.gz
Don't show green dismissed issues.
Bug: 296025896 Test: atest SafetyCenterSubpagesTestCases Relnote: Don't show green dismissed issues on Security & Privacy screen Change-Id: Ida32004826b1bc0ac5773dd2d3b885405419defd
Diffstat (limited to 'PermissionController/src/com/android')
-rw-r--r--PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/SafetyCenterUiData.kt8
1 files changed, 7 insertions, 1 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/SafetyCenterUiData.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/SafetyCenterUiData.kt
index 39241ff9a..239f9a377 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/SafetyCenterUiData.kt
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/SafetyCenterUiData.kt
@@ -21,6 +21,7 @@ import android.safetycenter.SafetyCenterData
import android.safetycenter.SafetyCenterEntryGroup
import android.safetycenter.SafetyCenterEntryOrGroup
import android.safetycenter.SafetyCenterIssue
+import android.safetycenter.SafetyCenterIssue.ISSUE_SEVERITY_LEVEL_OK
import androidx.annotation.RequiresApi
import com.android.safetycenter.internaldata.SafetyCenterBundles.ISSUES_TO_GROUPS_BUNDLE_KEY
@@ -51,7 +52,7 @@ data class SafetyCenterUiData(
*/
@RequiresApi(UPSIDE_DOWN_CAKE)
fun getMatchingDismissedIssues(groupId: String): List<SafetyCenterIssue> =
- selectMatchingIssuesForGroup(groupId, safetyCenterData.dismissedIssues)
+ selectMatchingIssuesForGroup(groupId, safetyCenterData.visibleDismissedIssues())
@RequiresApi(UPSIDE_DOWN_CAKE)
private fun selectMatchingIssuesForGroup(
@@ -68,4 +69,9 @@ data class SafetyCenterUiData(
if (mappingExists) matchesInMapping else matchesByDefault
}
}
+
+ /** Returns the [SafetyCenterData.getDismissedIssues] that are meant to be visible in the UI. */
+ @RequiresApi(UPSIDE_DOWN_CAKE)
+ fun SafetyCenterData.visibleDismissedIssues() =
+ dismissedIssues.filter { it.severityLevel > ISSUE_SEVERITY_LEVEL_OK }
}