From 3b3e66c780c694939654cab2ecfe00b4d315882e Mon Sep 17 00:00:00 2001
From: Chaohui Wang <chaohuiw@google.com>
Date: Wed, 6 Apr 2022 17:22:12 +0800
Subject: [PATCH] Fix the flow for ZenCustomRuleSettingsBase

updateRule() should be called before super.onResume() because rule will
be used in updatePreferenceStates() in super.onResume().

This is follow up of Change: Ief9963091847d58654f26851616563ae910716a5

Bug: 226523115
Test: manual
Change-Id: I2fe0cfb2b4a76273283bb2d3aca629b5d647db91
---
 .../notification/zen/ZenCustomRuleSettingsBase.java      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/notification/zen/ZenCustomRuleSettingsBase.java b/src/com/android/settings/notification/zen/ZenCustomRuleSettingsBase.java
index b417e032915..12605af5974 100644
--- a/src/com/android/settings/notification/zen/ZenCustomRuleSettingsBase.java
+++ b/src/com/android/settings/notification/zen/ZenCustomRuleSettingsBase.java
@@ -59,6 +59,10 @@ abstract class ZenCustomRuleSettingsBase extends ZenModeSettingsBase {
 
     @Override
     public void onResume() {
+        if (!mIsFirstLaunch) {
+            // Rule will be used in updatePreferenceStates() in super.onResume().
+            updateRule();
+        }
         super.onResume();
         updatePreferences();
     }
@@ -66,6 +70,7 @@ abstract class ZenCustomRuleSettingsBase extends ZenModeSettingsBase {
     @Override
     public void onZenModeConfigChanged() {
         super.onZenModeConfigChanged();
+        updateRule();
         updatePreferences();
         updatePreferenceStates();
     }
@@ -80,10 +85,6 @@ abstract class ZenCustomRuleSettingsBase extends ZenModeSettingsBase {
     }
 
     public void updatePreferences() {
-        if (!mIsFirstLaunch) {
-            updateRule();
-        }
-
         final PreferenceScreen screen = getPreferenceScreen();
         String categoryKey = getPreferenceCategoryKey();
         if (categoryKey != null) {