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

Commit d94caf0a authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Automerger Merge Worker
Browse files

Merge "Fix AlarmManager high CPU issue" into main am: 4790920b 

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



Change-Id: I0ad7c2fd8f8ced98aa61a6d9b0f4ec1c8aa224f2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ff31098b 4790920b

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ import static android.app.AlarmManager.ELAPSED_REALTIME_WAKEUP; 
import static android.app.AlarmManager.RTC;

import static android.app.AlarmManager.RTC;

import static android.app.AlarmManager.RTC_WAKEUP;

import static android.app.AlarmManager.RTC_WAKEUP;





import static com.android.server.alarm.AlarmManagerService.clampPositive;

import static com.android.server.alarm.AlarmManagerService.addClampPositive;





import android.app.AlarmManager;

import android.app.AlarmManager;

import android.app.IAlarmListener;

import android.app.IAlarmListener;
@@ -146,7 +146,7 @@ class Alarm { 
        mPolicyWhenElapsed[REQUESTER_POLICY_INDEX] = requestedWhenElapsed;

        mPolicyWhenElapsed[REQUESTER_POLICY_INDEX] = requestedWhenElapsed;

        mWhenElapsed = requestedWhenElapsed;

        mWhenElapsed = requestedWhenElapsed;

        this.windowLength = windowLength;

        this.windowLength = windowLength;

        mMaxWhenElapsed = clampPositive(requestedWhenElapsed + windowLength);

        mMaxWhenElapsed = addClampPositive(requestedWhenElapsed, windowLength);

        repeatInterval = interval;

        repeatInterval = interval;

        operation = op;

        operation = op;

        listener = rec;

        listener = rec;
@@ -241,8 +241,8 @@ class Alarm { 




        final long oldMaxWhenElapsed = mMaxWhenElapsed;

        final long oldMaxWhenElapsed = mMaxWhenElapsed;

        // windowLength should always be >= 0 here.

        // windowLength should always be >= 0 here.

        final long maxRequestedElapsed = clampPositive(

        final long maxRequestedElapsed = addClampPositive(

                mPolicyWhenElapsed[REQUESTER_POLICY_INDEX] + windowLength);

                mPolicyWhenElapsed[REQUESTER_POLICY_INDEX], windowLength);

        mMaxWhenElapsed = Math.max(maxRequestedElapsed, mWhenElapsed);

        mMaxWhenElapsed = Math.max(maxRequestedElapsed, mWhenElapsed);





        return (oldWhenElapsed != mWhenElapsed) || (oldMaxWhenElapsed != mMaxWhenElapsed);

        return (oldWhenElapsed != mWhenElapsed) || (oldMaxWhenElapsed != mMaxWhenElapsed);

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

+15 −3
Original line number Original line Diff line number Diff line
@@ -1498,15 +1498,15 @@ public class AlarmManagerService extends SystemService { 
        if (futurity < MIN_FUZZABLE_INTERVAL) {

        if (futurity < MIN_FUZZABLE_INTERVAL) {

            futurity = 0;

            futurity = 0;

        }

        }

        long maxElapsed = triggerAtTime + (long) (0.75 * futurity);

        long maxElapsed = addClampPositive(triggerAtTime, (long) (0.75 * futurity));

        // For non-repeating alarms, window is capped at a maximum of one hour from the requested

        // For non-repeating alarms, window is capped at a maximum of one hour from the requested

        // delivery time. This allows for inexact-while-idle alarms to be slightly more reliable.

        // delivery time. This allows for inexact-while-idle alarms to be slightly more reliable.

        // In practice, the delivery window should generally be much smaller than that

        // In practice, the delivery window should generally be much smaller than that

        // when the device is not idling.

        // when the device is not idling.

        if (interval == 0) {

        if (interval == 0) {

            maxElapsed = Math.min(maxElapsed, triggerAtTime + INTERVAL_HOUR);

            maxElapsed = Math.min(maxElapsed, addClampPositive(triggerAtTime, INTERVAL_HOUR));

        }

        }

        return clampPositive(maxElapsed);

        return maxElapsed;

    }

    }





    // The RTC clock has moved arbitrarily, so we need to recalculate all the RTC alarm deliveries.

    // The RTC clock has moved arbitrarily, so we need to recalculate all the RTC alarm deliveries.
@@ -1593,6 +1593,18 @@ public class AlarmManagerService extends SystemService { 
        return (val >= 0) ? val : Long.MAX_VALUE;

        return (val >= 0) ? val : Long.MAX_VALUE;

    }

    }





    static long addClampPositive(long val1, long val2) {

        long val = val1 + val2;

        if (val >= 0) {

            return val;

        } else if (val1 >= 0 && val2 >= 0) {

            /* Both are +ve, so overflow happened. */

            return Long.MAX_VALUE;

        } else {

            return 0;

        }

    }



    /**

    /**

     * Sends alarms that were blocked due to user applied background restrictions - either because

     * Sends alarms that were blocked due to user applied background restrictions - either because

     * the user lifted those or the uid came to foreground.

     * the user lifted those or the uid came to foreground.