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

Commit e499e7db authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Change the wakeup alarms for "light-doze-maintenance step" to... 

Merge "Change the wakeup alarms for "light-doze-maintenance step" to non-wakeup alarms" am: d1d21076 am: 7228ad6c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1907414

Change-Id: Ie70871a7b00170e0ddde6cf6001aee59eb6d585f
parents 81a34fe5 7228ad6c

apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java

+17 −11
Original line number Diff line number Diff line
@@ -3302,7 +3302,7 @@ public class DeviceIdleController extends SystemService 
            if (DEBUG) Slog.d(TAG, "Moved from LIGHT_STATE_ACTIVE to LIGHT_STATE_INACTIVE");

            resetLightIdleManagementLocked();

            scheduleLightAlarmLocked(mConstants.LIGHT_IDLE_AFTER_INACTIVE_TIMEOUT,

                    mConstants.FLEX_TIME_SHORT);

                    mConstants.FLEX_TIME_SHORT, true);

            EventLogTags.writeDeviceIdleLight(mLightState, "no activity");

        }

    }
@@ -3377,7 +3377,7 @@ public class DeviceIdleController extends SystemService 
                    mLightState = LIGHT_STATE_PRE_IDLE;

                    EventLogTags.writeDeviceIdleLight(mLightState, reason);

                    scheduleLightAlarmLocked(mConstants.LIGHT_PRE_IDLE_TIMEOUT,

                            mConstants.FLEX_TIME_SHORT);

                            mConstants.FLEX_TIME_SHORT, true);

                    break;

                }

                // Nothing active, fall through to immediately idle.
@@ -3396,7 +3396,7 @@ public class DeviceIdleController extends SystemService 
                    }

                }

                mMaintenanceStartTime = 0;

                scheduleLightAlarmLocked(mNextLightIdleDelay, mNextLightIdleDelayFlex);

                scheduleLightAlarmLocked(mNextLightIdleDelay, mNextLightIdleDelayFlex, false);

                mNextLightIdleDelay = Math.min(mConstants.LIGHT_MAX_IDLE_TIMEOUT,

                        (long) (mNextLightIdleDelay * mConstants.LIGHT_IDLE_FACTOR));

                mNextLightIdleDelayFlex = Math.min(mConstants.LIGHT_MAX_IDLE_TIMEOUT_FLEX,
@@ -3420,7 +3420,7 @@ public class DeviceIdleController extends SystemService 
                    } else if (mCurLightIdleBudget > mConstants.LIGHT_IDLE_MAINTENANCE_MAX_BUDGET) {

                        mCurLightIdleBudget = mConstants.LIGHT_IDLE_MAINTENANCE_MAX_BUDGET;

                    }

                    scheduleLightAlarmLocked(mCurLightIdleBudget, mConstants.FLEX_TIME_SHORT);

                    scheduleLightAlarmLocked(mCurLightIdleBudget, mConstants.FLEX_TIME_SHORT, true);

                    if (DEBUG) Slog.d(TAG,

                            "Moved from LIGHT_STATE_IDLE to LIGHT_STATE_IDLE_MAINTENANCE.");

                    mLightState = LIGHT_STATE_IDLE_MAINTENANCE;
@@ -3431,7 +3431,8 @@ public class DeviceIdleController extends SystemService 
                    // We'd like to do maintenance, but currently don't have network

                    // connectivity...  let's try to wait until the network comes back.

                    // We'll only wait for another full idle period, however, and then give up.

                    scheduleLightAlarmLocked(mNextLightIdleDelay, mNextLightIdleDelayFlex / 2);

                    scheduleLightAlarmLocked(mNextLightIdleDelay,

                            mNextLightIdleDelayFlex / 2, true);

                    if (DEBUG) Slog.d(TAG, "Moved to LIGHT_WAITING_FOR_NETWORK.");

                    mLightState = LIGHT_STATE_WAITING_FOR_NETWORK;

                    EventLogTags.writeDeviceIdleLight(mLightState, reason);
@@ -3964,18 +3965,23 @@ public class DeviceIdleController extends SystemService 
        }

    }



    void scheduleLightAlarmLocked(long delay, long flex) {

    @GuardedBy("this")

    void scheduleLightAlarmLocked(long delay, long flex, boolean wakeup) {

        if (DEBUG) {

            Slog.d(TAG, "scheduleLightAlarmLocked(" + delay

            Slog.d(TAG, "scheduleLightAlarmLocked(wakeup=" + wakeup + ", " + delay

                    + (mConstants.USE_WINDOW_ALARMS ? "/" + flex : "") + ")");

        }

        mNextLightAlarmTime = SystemClock.elapsedRealtime() + delay;

        if (mConstants.USE_WINDOW_ALARMS) {

            mAlarmManager.setWindow(AlarmManager.ELAPSED_REALTIME_WAKEUP, mNextLightAlarmTime, flex,

                    "DeviceIdleController.light", mLightAlarmListener, mHandler);

            mAlarmManager.setWindow(wakeup ? AlarmManager.ELAPSED_REALTIME_WAKEUP :

                    AlarmManager.ELAPSED_REALTIME,

                    mNextLightAlarmTime, flex, "DeviceIdleController.light", mLightAlarmListener,

                    mHandler);

        } else {

            mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, mNextLightAlarmTime,

                    "DeviceIdleController.light", mLightAlarmListener, mHandler);

            mAlarmManager.set(wakeup ? AlarmManager.ELAPSED_REALTIME_WAKEUP :

                    AlarmManager.ELAPSED_REALTIME,

                    mNextLightAlarmTime, "DeviceIdleController.light", mLightAlarmListener,

                    mHandler);

        }

    }

services/art-profile

+1 −1
Original line number Diff line number Diff line
@@ -1464,7 +1464,7 @@ HSPLcom/android/server/DeviceIdleController;->reportTempWhitelistChangedLocked(I 
HPLcom/android/server/DeviceIdleController;->resetIdleManagementLocked()V+]Lcom/android/server/AnyMotionDetector;Lcom/android/server/AnyMotionDetector;]Lcom/android/server/DeviceIdleController;Lcom/android/server/DeviceIdleController;

HPLcom/android/server/DeviceIdleController;->resetLightIdleManagementLocked()V+]Lcom/android/server/DeviceIdleController;Lcom/android/server/DeviceIdleController;

HPLcom/android/server/DeviceIdleController;->scheduleAlarmLocked(JZ)V+]Landroid/app/AlarmManager;Landroid/app/AlarmManager;

HPLcom/android/server/DeviceIdleController;->scheduleLightAlarmLocked(JJ)V+]Landroid/app/AlarmManager;Landroid/app/AlarmManager;

HPLcom/android/server/DeviceIdleController;->scheduleLightAlarmLocked(JJZ)V+]Landroid/app/AlarmManager;Landroid/app/AlarmManager;

HPLcom/android/server/DeviceIdleController;->scheduleMotionRegistrationAlarmLocked()V+]Lcom/android/server/DeviceIdleController$Injector;Lcom/android/server/DeviceIdleController$Injector;]Landroid/app/AlarmManager;Landroid/app/AlarmManager;

HSPLcom/android/server/DeviceIdleController;->scheduleMotionTimeoutAlarmLocked()V+]Landroid/app/AlarmManager;Landroid/app/AlarmManager;]Lcom/android/server/DeviceIdleController$Injector;Lcom/android/server/DeviceIdleController$Injector;

HPLcom/android/server/DeviceIdleController;->scheduleReportActiveLocked(Ljava/lang/String;I)V+]Lcom/android/server/DeviceIdleController$MyHandler;Lcom/android/server/DeviceIdleController$MyHandler;

services/tests/mockingservicestests/src/com/android/server/DeviceIdleControllerTest.java

+10 −5
Original line number Diff line number Diff line
@@ -1047,7 +1047,8 @@ public class DeviceIdleControllerTest { 
        verifyLightStateConditions(LIGHT_STATE_IDLE);

        inOrder.verify(mDeviceIdleController).scheduleLightAlarmLocked(

                longThat(l -> l == mConstants.LIGHT_IDLE_TIMEOUT),

                longThat(l -> l == mConstants.LIGHT_IDLE_TIMEOUT_INITIAL_FLEX));

                longThat(l -> l == mConstants.LIGHT_IDLE_TIMEOUT_INITIAL_FLEX),

                eq(false));



        // Should just alternate between IDLE and IDLE_MAINTENANCE now.
@@ -1055,19 +1056,22 @@ public class DeviceIdleControllerTest { 
        verifyLightStateConditions(LIGHT_STATE_IDLE_MAINTENANCE);

        inOrder.verify(mDeviceIdleController).scheduleLightAlarmLocked(

                longThat(l -> l >= mConstants.LIGHT_IDLE_MAINTENANCE_MIN_BUDGET),

                longThat(l -> l == mConstants.FLEX_TIME_SHORT));

                longThat(l -> l == mConstants.FLEX_TIME_SHORT),

                eq(true));



        mDeviceIdleController.stepLightIdleStateLocked("testing");

        verifyLightStateConditions(LIGHT_STATE_IDLE);

        inOrder.verify(mDeviceIdleController).scheduleLightAlarmLocked(

                longThat(l -> l > mConstants.LIGHT_IDLE_TIMEOUT),

                longThat(l -> l > mConstants.LIGHT_IDLE_TIMEOUT_INITIAL_FLEX));

                longThat(l -> l > mConstants.LIGHT_IDLE_TIMEOUT_INITIAL_FLEX),

                eq(false));



        mDeviceIdleController.stepLightIdleStateLocked("testing");

        verifyLightStateConditions(LIGHT_STATE_IDLE_MAINTENANCE);

        inOrder.verify(mDeviceIdleController).scheduleLightAlarmLocked(

                longThat(l -> l >= mConstants.LIGHT_IDLE_MAINTENANCE_MIN_BUDGET),

                longThat(l -> l == mConstants.FLEX_TIME_SHORT));

                longThat(l -> l == mConstants.FLEX_TIME_SHORT),

                eq(true));



        // Test that motion doesn't reset the idle timeout.

        mDeviceIdleController.handleMotionDetectedLocked(50, "test");
@@ -1076,7 +1080,8 @@ public class DeviceIdleControllerTest { 
        verifyLightStateConditions(LIGHT_STATE_IDLE);

        inOrder.verify(mDeviceIdleController).scheduleLightAlarmLocked(

                longThat(l -> l > mConstants.LIGHT_IDLE_TIMEOUT),

                longThat(l -> l > mConstants.LIGHT_IDLE_TIMEOUT_INITIAL_FLEX));

                longThat(l -> l > mConstants.LIGHT_IDLE_TIMEOUT_INITIAL_FLEX),

                eq(false));

    }



    ///////////////// EXIT conditions ///////////////////