commit a65c198f233c3b83ee305a2c3d5a5bfa3fbe198e
author Saumya Prakash <saumyaprakash@google.com> Mon Oct 16 21:51:27 2023 +0000
committer Saumya Prakash <saumyaprakash@google.com> Tue Oct 17 18:01:28 2023 +0000
tree fb4e165691147940b37cf759d9991c5e37f9b6b5
parent 9f34a29d0ea49780b477db2b47e11e48e5076d53

Check status of mEdgeBackGestureHandler to prevent NPE

Sometimes onAttachedToWindow() can be called before
mEdgeBackGestureHandler is created, which led to a NPE. This change adds
a null check to prevent the crash.

Fix: 303820749
Test: Set mEdgeBackGestureHandler to null and ensured no NPE occured in
onAttachedWindow()

Change-Id: I43ab8bcfc4d720bc537a7ca36e08068a6a27fbea

quickstep/src/com/android/quickstep/interaction/TutorialFragment.java

diff --git a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
index a28cf58..69c15a5 100644
--- a/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
+++ b/quickstep/src/com/android/quickstep/interaction/TutorialFragment.java
@@ -84,6 +84,7 @@
     private DeviceProfile mDeviceProfile;
     private boolean mIsLargeScreen;
     private boolean mIsFoldable;
+    private boolean mOnAttachedToWindowPendingCreate;
 
     public static TutorialFragment newInstance(
             TutorialType tutorialType, boolean gestureComplete, boolean fromTutorialMenu) {
@@ -174,6 +175,11 @@
                 .getDeviceProfile(getContext());
         mIsLargeScreen = mDeviceProfile.isTablet;
         mIsFoldable = mDeviceProfile.isTwoPanels;
+
+        if (mOnAttachedToWindowPendingCreate) {
+            mOnAttachedToWindowPendingCreate = false;
+            onAttachedToWindow();
+        }
     }
 
     public boolean isLargeScreen() {
@@ -373,6 +379,10 @@
 
     @Override
     void onAttachedToWindow() {
+        if (mEdgeBackGestureHandler == null) {
+            mOnAttachedToWindowPendingCreate = true;
+            return;
+        }
         StatsLogManager statsLogManager = getStatsLogManager();
         if (statsLogManager != null) {
             logTutorialStepShown(statsLogManager);
@@ -382,6 +392,7 @@
 
     @Override
     void onDetachedFromWindow() {
+        mOnAttachedToWindowPendingCreate = false;
         mEdgeBackGestureHandler.setViewGroupParent(null);
     }