Merge "Hide loading view if config service is not available" into main

2024-12-02 05:22:13 +00:00
parent a25c82a346 e994e8eab5
commit 628c9d9e24
1 changed files with 8 additions and 2 deletions
--- a/src/com/android/settings/bluetooth/ui/view/DeviceDetailsFragmentFormatter.kt
+++ b/src/com/android/settings/bluetooth/ui/view/DeviceDetailsFragmentFormatter.kt
@@ -138,8 +138,14 @@ class DeviceDetailsFragmentFormatterImpl(
    }

    private suspend fun updateLayoutInternal(fragmentType: FragmentTypeModel) {
-        val items = viewModel.getItems(fragmentType) ?: return
-        val layout = viewModel.getLayout(fragmentType) ?: return
+        val items = viewModel.getItems(fragmentType) ?: run {
+            fragment.setLoading(false, false)
+            return
+        }
+        val layout = viewModel.getLayout(fragmentType) ?: run {
+            fragment.setLoading(false, false)
+            return
+        }

        val prefKeyToSettingId =
            items