Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc37cde0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Flag removal: StartUserBeforeScheduledAlarms" into main

parents aa10285b 4f5119cb

apex/jobscheduler/service/aconfig/alarm.aconfig

+0 −7
Original line number Diff line number Diff line 
package: "com.android.server.alarm"

container: "system"



flag {

    name: "start_user_before_scheduled_alarms"

    namespace: "multiuser"

    description: "Persist list of users with alarms scheduled and wakeup stopped users before alarms are due"

    bug: "314907186"

}



flag {

    name: "acquire_wakelock_before_send"

    namespace: "backstage_power"

apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java

+3 −6
Original line number Diff line number Diff line
@@ -1784,8 +1784,8 @@ public class AlarmManagerService extends SystemService { 
        mMetricsHelper = new MetricsHelper(getContext(), mLock);

        mActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class);



        mStartUserBeforeScheduledAlarms = Flags.startUserBeforeScheduledAlarms()

                && UserManager.supportsMultipleUsers() && Resources.getSystem().getBoolean(

        mStartUserBeforeScheduledAlarms = UserManager.supportsMultipleUsers()

                && Resources.getSystem().getBoolean(

                        com.android.internal.R.bool.config_allowAlarmsOnStoppedUsers);

        if (mStartUserBeforeScheduledAlarms) {

            mUserWakeupStore = new UserWakeupStore();
@@ -2992,9 +2992,6 @@ public class AlarmManagerService extends SystemService { 


            pw.println("Feature Flags:");

            pw.increaseIndent();

            pw.print(Flags.FLAG_START_USER_BEFORE_SCHEDULED_ALARMS,

                    Flags.startUserBeforeScheduledAlarms());

            pw.println();

            pw.print(Flags.FLAG_ACQUIRE_WAKELOCK_BEFORE_SEND, Flags.acquireWakelockBeforeSend());

            pw.println();

            pw.decreaseIndent();

services/tests/mockingservicestests/src/com/android/server/alarm/AlarmManagerServiceTest.java

+0 −4
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ import android.os.ServiceManager; 
import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserManager;

import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.annotations.Presubmit;

import android.platform.test.flag.junit.SetFlagsRule;
@@ -437,7 +436,6 @@ public final class AlarmManagerServiceTest { 
     */

    private void disableFlagsNotSetByAnnotation() {

        try {

            mSetFlagsRule.disableFlags(Flags.FLAG_START_USER_BEFORE_SCHEDULED_ALARMS);

            mSetFlagsRule.disableFlags(Flags.FLAG_ACQUIRE_WAKELOCK_BEFORE_SEND);

        } catch (FlagSetException fse) {

            // Expected if the test about to be run requires this enabled.
@@ -3838,7 +3836,6 @@ public final class AlarmManagerServiceTest { 
        mUidFrozenStateCallback.onUidFrozenStateChanged(uids, frozenStates);

    }



    @DisableFlags(Flags.FLAG_START_USER_BEFORE_SCHEDULED_ALARMS)

    @Test

    public void exactListenerAlarmsRemovedOnFrozen() {

        mockChangeEnabled(EXACT_LISTENER_ALARMS_DROPPED_ON_CACHED, true);
@@ -3869,7 +3866,6 @@ public final class AlarmManagerServiceTest { 
        assertEquals(6, mService.mAlarmStore.size());

    }



    @DisableFlags(Flags.FLAG_START_USER_BEFORE_SCHEDULED_ALARMS)

    @Test

    public void alarmCountOnListenerFrozen() {

        mockChangeEnabled(EXACT_LISTENER_ALARMS_DROPPED_ON_CACHED, true);