From c4a9dc4c09102ea6242a700d98e1462b97c85eb3 Mon Sep 17 00:00:00 2001
From: mcarare <mihai.carare.dev@gmail.com>
Date: Wed, 24 Jun 2020 18:16:08 +0300
Subject: [PATCH] For #11901: Use safe call for collection item info.

---
 .../fenix/tabtray/TabTrayViewHolder.kt        | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt
index 697c0d4233d3..9745caa8ae75 100644
--- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt
@@ -185,15 +185,16 @@ class TabTrayViewHolder(
             ) {
                 super.onInitializeAccessibilityNodeInfo(host, info)
                 info?.let {
-                    val initialInfo = info.collectionItemInfo
-                    info.collectionItemInfo = AccessibilityNodeInfo.CollectionItemInfo.obtain(
-                        newIndex,
-                        initialInfo.rowSpan,
-                        initialInfo.columnIndex,
-                        initialInfo.columnSpan,
-                        false,
-                        initialInfo.isSelected
-                    )
+                    info.collectionItemInfo = info.collectionItemInfo?.let { initialInfo ->
+                        AccessibilityNodeInfo.CollectionItemInfo.obtain(
+                            newIndex,
+                            initialInfo.rowSpan,
+                            initialInfo.columnIndex,
+                            initialInfo.columnSpan,
+                            false,
+                            initialInfo.isSelected
+                        )
+                    }
                 }
             }
         })