commit 5302093d5c243207752fe3df27fa78737e4e432b
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Dec 10 16:43:42 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 10 16:43:42 2021 +0000
tree 3728f728924ae69bc45892406697991feed8ebfe
parent d7196d57b08b9fbf9756bf65c16b00cb63ba071e
parent 56c49091a0e59dd53daaf31469a3d8e90b468233

Merge "Fix the onCreate crash happened among zen mode rule pages" into sc-v2-dev am: 56c49091a0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16432138

Change-Id: Id8a2517aadca439e98c6ba978652689898b442fd

src/com/android/settings/notification/zen/ZenModeRuleSettingsBase.java

diff --git a/src/com/android/settings/notification/zen/ZenModeRuleSettingsBase.java b/src/com/android/settings/notification/zen/ZenModeRuleSettingsBase.java
index 170c699..5ce8b48 100644
--- a/src/com/android/settings/notification/zen/ZenModeRuleSettingsBase.java
+++ b/src/com/android/settings/notification/zen/ZenModeRuleSettingsBase.java
@@ -59,6 +59,7 @@
 
     @Override
     public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
         mContext = getActivity();
 
         final Intent intent = getActivity().getIntent();
@@ -81,7 +82,6 @@
             return;
         }
 
-        super.onCreate(icicle);
         mCustomBehaviorPreference = getPreferenceScreen().findPreference(CUSTOM_BEHAVIOR_KEY);
         mCustomBehaviorPreference.setOnPreferenceClickListener(
                 new Preference.OnPreferenceClickListener() {