summaryrefslogtreecommitdiff
path: root/apex
diff options
context:
space:
mode:
author Tetiana Meronyk <tetianameronyk@google.com> 2024-12-20 17:30:33 +0000
committer Tetiana Meronyk <tetianameronyk@google.com> 2025-01-14 08:30:57 -0800
commit6d25f8b3bd01113857f5b88a27e71baf53ce0856 (patch)
tree4493a6045d26492cccd140eb0d9ad1027c9b93e5 /apex
parent6988e7a4a85b5e5ad8534849676afb43fd44ff83 (diff)
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
Diffstat (limited to 'apex')
-rw-r--r--apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java4
1 files changed, 3 insertions, 1 deletions
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();