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

Commit caea5510 authored by Suprabh Shukla's avatar Suprabh Shukla
Browse files

Release alarm wakelock if send fails 

Now that we're acquiring a wakelock before we dispatch the alarm to the
app, we also need to release it in cases where the dispatch results in
an exception, because the only other release point is in the path of
alarm completion or timeout.

Test: atest FrameworksMockingServicesTests:AlarmManagerServiceTest

Flag: com.android.server.alarm.acquire_wakelock_before_send

Bug: 397950542
Change-Id: I7f119c51e2377841396efb360b38f51c1ab17915
parent 73c4873c

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

+6 −0
Original line number Diff line number Diff line
@@ -5367,6 +5367,9 @@ public class AlarmManagerService extends SystemService { 
                        // to do any wakelock or stats tracking, so we have nothing

                        // left to do here but go on to the next thing.

                        mSendFinishCount++;

                        if (Flags.acquireWakelockBeforeSend()) {

                            mWakeLock.release();

                        }

                        return;

                    }

                } else {
@@ -5404,6 +5407,9 @@ public class AlarmManagerService extends SystemService { 
                        // stats management to do.  It threw before we posted the delayed

                        // timeout message, so we're done here.

                        mListenerFinishCount++;

                        if (Flags.acquireWakelockBeforeSend()) {

                            mWakeLock.release();

                        }

                        return;

                    }

                }

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

+35 −0
Original line number Diff line number Diff line
@@ -973,6 +973,41 @@ public final class AlarmManagerServiceTest { 
        inOrder.verify(mWakeLock).release();

    }



    @Test

    @EnableFlags(Flags.FLAG_ACQUIRE_WAKELOCK_BEFORE_SEND)

    public void testWakelockReleasedWhenSendFails() throws Exception {

        final long triggerTime = mNowElapsedTest + 5000;

        final PendingIntent alarmPi = getNewMockPendingIntent();

        setTestAlarm(ELAPSED_REALTIME_WAKEUP, triggerTime, alarmPi);



        doThrow(new PendingIntent.CanceledException("test")).when(alarmPi).send(eq(mMockContext),

                eq(0), any(Intent.class), any(), any(Handler.class), isNull(), any());



        mNowElapsedTest = mTestTimer.getElapsed();

        mTestTimer.expire();



        final InOrder inOrder = Mockito.inOrder(mWakeLock);

        inOrder.verify(mWakeLock).acquire();

        inOrder.verify(mWakeLock).release();

    }



    @Test

    @EnableFlags(Flags.FLAG_ACQUIRE_WAKELOCK_BEFORE_SEND)

    public void testWakelockReleasedOnListenerException() throws Exception {

        final long triggerTime = mNowElapsedTest + 5000;

        final IAlarmListener listener = getNewListener(() -> {

            throw new RuntimeException("test");

        });

        setTestAlarmWithListener(ELAPSED_REALTIME_WAKEUP, triggerTime, listener);



        mNowElapsedTest = mTestTimer.getElapsed();

        mTestTimer.expire();



        final InOrder inOrder = Mockito.inOrder(mWakeLock);

        inOrder.verify(mWakeLock).acquire();

        inOrder.verify(mWakeLock).release();

    }



    @Test

    public void testMinFuturityCoreUid() {

        setDeviceConfigLong(KEY_MIN_FUTURITY, 10L);