diff options
3 files changed, 5 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 4da2cc9bbe20..1c9bbab3969e 100755 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -2049,7 +2049,9 @@ public class NotificationManagerService extends SystemService { if (!mUserProfiles.isProfileUser(userId)) { mConditionProviders.onUserUnlocked(userId); mListeners.onUserUnlocked(userId); - mZenModeHelper.onUserUnlocked(userId); + if (!android.app.Flags.modesApi()) { + mZenModeHelper.onUserUnlocked(userId); + } } } } diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java index 41ff4150eb23..2f20bbe7f29c 100644 --- a/services/core/java/com/android/server/notification/ZenModeHelper.java +++ b/services/core/java/com/android/server/notification/ZenModeHelper.java @@ -328,6 +328,7 @@ public class ZenModeHelper { } } + // TODO: b/310620812 - Remove when MODES_API is inlined (no more callers). public void onUserUnlocked(int user) { loadConfigForUser(user, "onUserUnlocked"); } diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java index 5d114f4bb702..74622014aa5c 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java @@ -5202,7 +5202,7 @@ public class ZenModeHelperTest extends UiServiceTestCase { // rules for a missing package, created a long time ago and deleted a long time ago config.deletedRules.put("del6", newZenRule("bad_pkg", twoMonthsAgo, twoMonthsAgo)); - mZenModeHelper.onUserUnlocked(42); // copies config and cleans it up. + mZenModeHelper.onUserSwitched(42); // copies config and cleans it up. assertThat(mZenModeHelper.mConfig.automaticRules.keySet()) .containsExactly("ar1", "ar2", "ar3", "ar4"); |