From 04e5b90e5293643be3108390ece5f64a7a5eec3c Mon Sep 17 00:00:00 2001 From: Tetiana Meronyk Date: Mon, 15 Jul 2024 15:53:34 +0000 Subject: Enable user of UserWakeupStore only on devices that support multiuser. Since devices that do not support multiuser do not have secondary users, there is no need to store wakeups on them. Bug: 352696527 Test: atest AlarmManagerServiceTest Flag: com.android.server.alarm.start_user_before_scheduled_alarms Change-Id: Id1b7d4ae514de42c21e1fdee670d36a88dbeae3d --- .../service/java/com/android/server/alarm/AlarmManagerService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 dfa72069c28a..ee03e4b2ccd1 100644 --- a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java +++ b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java @@ -120,6 +120,7 @@ import android.os.SystemProperties; import android.os.ThreadLocalWorkSource; import android.os.Trace; import android.os.UserHandle; +import android.os.UserManager; import android.os.WorkSource; import android.provider.DeviceConfig; import android.provider.Settings; @@ -1794,7 +1795,8 @@ public class AlarmManagerService extends SystemService { mActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class); mUseFrozenStateToDropListenerAlarms = Flags.useFrozenStateToDropListenerAlarms(); - mStartUserBeforeScheduledAlarms = Flags.startUserBeforeScheduledAlarms(); + mStartUserBeforeScheduledAlarms = Flags.startUserBeforeScheduledAlarms() + && UserManager.supportsMultipleUsers(); if (mStartUserBeforeScheduledAlarms) { mUserWakeupStore = new UserWakeupStore(); mUserWakeupStore.init(); @@ -3015,7 +3017,7 @@ public class AlarmManagerService extends SystemService { mUseFrozenStateToDropListenerAlarms); pw.println(); pw.print(Flags.FLAG_START_USER_BEFORE_SCHEDULED_ALARMS, - mStartUserBeforeScheduledAlarms); + Flags.startUserBeforeScheduledAlarms()); pw.decreaseIndent(); pw.println(); pw.println(); -- cgit v1.2.3-59-g8ed1b