diff options
| author | 2024-04-28 23:52:32 +0000 | |
|---|---|---|
| committer | 2024-04-28 23:52:32 +0000 | |
| commit | a6f72d4ba13dd06767762eed0ca403e2c683bd5c (patch) | |
| tree | ae96b99021b2a407f1a2f7b2fc360cf8702b9f4c | |
| parent | ea481c695e52632721a9ec51a3cb24f322cb4008 (diff) | |
| parent | 5db105741786c6f4f6039cdf84696fe2b30f8aa1 (diff) | |
Merge "Fix default app and Request role settings issues" into main
2 files changed, 3 insertions, 3 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearDefaultAppHelper.kt b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearDefaultAppHelper.kt index d8928d608..48f0d8d73 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearDefaultAppHelper.kt +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearDefaultAppHelper.kt @@ -119,5 +119,5 @@ class WearDefaultAppHelper( private fun hasHolderApplication( qualifyingApplications: List<Pair<ApplicationInfo, Boolean>> - ): Boolean = qualifyingApplications.map { it.second }.find { true } ?: false + ): Boolean = qualifyingApplications.map { it.second }.contains(true) } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRequestRoleHelper.kt b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRequestRoleHelper.kt index f1d6ba97b..c7f14b862 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRequestRoleHelper.kt +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRequestRoleHelper.kt @@ -62,7 +62,7 @@ class WearRequestRoleHelper( null }, icon = context.getDrawable(R.drawable.ic_remove_circle), - checked = selectedPackage?.isNullOrEmpty() ?: false, + checked = selectedPackage.isNullOrEmpty(), enabled = if (!wearViewModel.dontAskAgain()) { true @@ -106,7 +106,7 @@ class WearRequestRoleHelper( private fun hasHolderApplication( qualifyingApplications: List<Pair<ApplicationInfo, Boolean>> - ): Boolean = qualifyingApplications.map { it.second }.find { true } ?: false + ): Boolean = qualifyingApplications.map { it.second }.contains(true) fun shouldSetAsDefaultEnabled(enabled: Boolean): Boolean { return enabled && (wearViewModel.dontAskAgain() || !wearViewModel.isHolderChecked) |