From b64d3589c1a14f831bc20f2b9c8aeccd923acffe Mon Sep 17 00:00:00 2001
From: Yi-Ling Chuang <emilychuang@google.com>
Date: Wed, 18 May 2022 16:29:21 +0800
Subject: [PATCH] Guard against the NPE in getTransitionType()

Bug: 232852095
Test: Go to fingerprint enrolling page and see the transition stays the
same(sliding) after this change.

Change-Id: I259eb4362b273f6b297e94d59d6720a9d6bf6373
---
 src/com/android/settings/core/SettingsBaseActivity.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java
index 7842459f2e1..322b971cfad 100644
--- a/src/com/android/settings/core/SettingsBaseActivity.java
+++ b/src/com/android/settings/core/SettingsBaseActivity.java
@@ -260,6 +260,9 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa
     }
 
     private int getTransitionType(Intent intent) {
+        if (intent == null) {
+            return TransitionType.TRANSITION_NONE;
+        }
         return intent.getIntExtra(EXTRA_PAGE_TRANSITION_TYPE, TransitionType.TRANSITION_NONE);
     }
 }