From 631c1ed72695745a59bf1510f120237fb12a3129 Mon Sep 17 00:00:00 2001
From: Sally <sallyyuen@google.com>
Date: Fri, 18 Mar 2022 20:31:51 +0000
Subject: [PATCH] Check for null text location when applying scaling changes

Bug: 225379715
Test: builds
Change-Id: I3cd88c315cbf7e1b3c7f5047d051c301a9caa848
---
 core/java/android/view/AccessibilityInteractionController.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/java/android/view/AccessibilityInteractionController.java b/core/java/android/view/AccessibilityInteractionController.java
index 43c07c8ab97e2..7e0b79470cf23 100644
--- a/core/java/android/view/AccessibilityInteractionController.java
+++ b/core/java/android/view/AccessibilityInteractionController.java
@@ -992,6 +992,9 @@ public final class AccessibilityInteractionController {
                     // Unchecked cast - an app that puts other objects in this bundle with this
                     // key will crash.
                     RectF textLocation = ((RectF) textLocations[i]);
+                    if (textLocation == null) {
+                        continue;
+                    }
                     textLocation.scale(applicationScale);
                     if (spec != null) {
                         textLocation.scale(spec.scale);