From 32e92cf7e1f7df3076837d6e47547a337e6d95ad Mon Sep 17 00:00:00 2001
From: Cutter Coryell <coryell@google.com>
Date: Tue, 23 Aug 2022 15:24:01 -0700
Subject: [PATCH] EdgeBackGestureHandler: Add null check to fix null pointer
 exception.

Fix: 242265617
Test: atest OnBackInvokedDispatcherTest BackAnimationControllerTest BackNavigationControllerTests
Change-Id: I46c1d36808507926273451dca05a9b0764fc0678
---
 .../navigationbar/gestural/EdgeBackGestureHandler.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
index 6ac3eadb838d0..7c4c64c200898 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
@@ -814,8 +814,10 @@ public class EdgeBackGestureHandler extends CurrentUserTracker
         }
         mLogGesture = false;
         String logPackageName = "";
+        Map<String, Integer> vocab = mVocab;
         // Due to privacy, only top 100 most used apps by all users can be logged.
-        if (mUseMLModel && mVocab.containsKey(mPackageName) && mVocab.get(mPackageName) < 100) {
+        if (mUseMLModel && vocab != null && vocab.containsKey(mPackageName)
+                && vocab.get(mPackageName) < 100) {
             logPackageName = mPackageName;
         }
         SysUiStatsLog.write(SysUiStatsLog.BACK_GESTURE_REPORTED_REPORTED, backType,