From 6d25f8b3bd01113857f5b88a27e71baf53ce0856 Mon Sep 17 00:00:00 2001 From: Tetiana Meronyk Date: Fri, 20 Dec 2024 17:30:33 +0000 Subject: Add config overlay for alarms improvement features in multiuser By default the features are enabled but can be disabled by overriding their values in corresponding overlay file. Bug: 385341949 Test: atest UserManagerServiceTest && atest VibratorManagerServiceTest && atest AlarmManagerServiceTest // with config values both on and off Flag: android.multiuser.multiple_alarm_notifications_support Change-Id: Ibfdd4d30920bdbef4a3ff1ec177ce8042f403d5d --- .../service/java/com/android/server/alarm/AlarmManagerService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'apex') diff --git a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java index 60ba3b896a28..829442aed6ac 100644 --- a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java +++ b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java @@ -96,6 +96,7 @@ import android.content.IntentFilter; import android.content.pm.PackageManager; import android.content.pm.PackageManagerInternal; import android.content.pm.UserPackage; +import android.content.res.Resources; import android.net.Uri; import android.os.BatteryManager; import android.os.BatteryStatsInternal; @@ -1784,7 +1785,8 @@ public class AlarmManagerService extends SystemService { mActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class); mStartUserBeforeScheduledAlarms = Flags.startUserBeforeScheduledAlarms() - && UserManager.supportsMultipleUsers(); + && UserManager.supportsMultipleUsers() && Resources.getSystem().getBoolean( + com.android.internal.R.bool.config_allowAlarmsOnStoppedUsers); if (mStartUserBeforeScheduledAlarms) { mUserWakeupStore = new UserWakeupStore(); mUserWakeupStore.init(); -- cgit v1.2.3-59-g8ed1b