commit 4fe7c0859f920ccb5cb63ffab7e701a0b4b5ebb9
author Fan Zhang <zhfan@google.com> Mon Oct 03 13:48:55 2016 -0700
committer Fan Zhang <zhfan@google.com> Mon Oct 03 13:50:59 2016 -0700
tree 91050e6cc6006fcad6a950fe41ceab26ae57c613
parent 8fdb96e32e86124b75e219fffa4c337d79db75f1

Fix a NPE when rotating dialog created by DialogCreatable.

Bug: 30088727
Test: make RunSettingsRoboTests
Change-Id: I775899809dfe920daa294f70d646b141da7c0706

src/com/android/settings/SettingsPreferenceFragment.java

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 575194b..b3f067a 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -46,6 +46,7 @@
 
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.core.InstrumentedFragment;
+import com.android.settings.core.instrumentation.Instrumentable;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settingslib.HelpUtils;
 
@@ -626,6 +627,9 @@
 
         @Override
         public int getMetricsCategory() {
+            if (mDialogCreatable == null) {
+                return Instrumentable.METRICS_CATEGORY_UNKNOWN;
+            }
             final int metricsCategory = mDialogCreatable.getDialogMetricsCategory(mDialogId);
             if (metricsCategory <= 0) {
                 throw new IllegalStateException("Dialog must provide a metrics category");