commit 3bf578c73e8dd36526382de5aed3e680f2e640b8
author Yi-Ling Chuang <emilychuang@google.com> Thu May 19 08:19:50 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 19 08:19:50 2022 +0000
tree 1549d20a54801100d72a22c4f4e527e5c35111b4
parent 72642fa03d5e22e1adba3d776ad75cefbdbba578
parent b64d3589c1a14f831bc20f2b9c8aeccd923acffe

Merge "Guard against the NPE in getTransitionType()" into tm-dev

src/com/android/settings/core/SettingsBaseActivity.java

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