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

Commit 24a1d2c9 authored by Evan Laird's avatar Evan Laird
Browse files

DO NOT MERGE: Associate notif cancels with notif posts 

CancelNotificationRunnables just spin on the work handler of
NotificationManagerService, hoping that they get executed at the correct
moment after a PostNotificationRunnable and before the next
EnqueueNotificationRunnable completes. Otherwise, you end up in a bad
state where the cancel either is canceling notifications before they get
a chance to post, or missing its only chance to cancel the notification
(for instance, ActivityManagerService is the only caller that can cancel
FGS notifications).

This change attempts to execute a CancelNotificationRunnable at the
moment its run() method is called, otherwise it associates the runnable
with the latest enqueued notificaiton record which has yet to post.

It then associates PostNotificationRunnable with the delayed cancel
list, executing any missed cancel operations immediately upon finishing
the PostNotificationRunnable.

Test: atest SystemUITests NotificationManagerServiceTest; manual
Bug: 162652224
Bug: 119041698
Change-Id: I88d3c5f4fd910a83974c2f84ae3e8a9498d18133
parent ec9dd28b

services/core/java/com/android/server/notification/InjectableSystemClock.java

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.notification;



/**

 * Testable wrapper around {@link android.os.SystemClock}.

 *

 * The default implementation at InjectableSystemClockImpl just proxies calls to the real

 * SystemClock

 *

 * In tests, pass an instance of FakeSystemClock, which allows you to control the values returned by

 * the various getters below.

 */

public interface InjectableSystemClock {

    /** @see android.os.SystemClock#uptimeMillis() */

    long uptimeMillis();



    /** @see android.os.SystemClock#elapsedRealtime() */

    long elapsedRealtime();



    /** @see android.os.SystemClock#elapsedRealtimeNanos() */

    long elapsedRealtimeNanos();



    /** @see android.os.SystemClock#currentThreadTimeMillis() */

    long currentThreadTimeMillis();



    /** @see System#currentTimeMillis()  */

    long currentTimeMillis();

}

services/core/java/com/android/server/notification/InjectableSystemClockImpl.java

0 → 100644
+51 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.notification;



/**

 * Default implementation of {@link InjectableSystemClock}.

 *

 * @hide

 */

public class InjectableSystemClockImpl implements InjectableSystemClock {

    public InjectableSystemClockImpl() {}



    @Override

    public long uptimeMillis() {

        return android.os.SystemClock.uptimeMillis();

    }



    @Override

    public long elapsedRealtime() {

        return android.os.SystemClock.elapsedRealtime();

    }



    @Override

    public long elapsedRealtimeNanos() {

        return android.os.SystemClock.elapsedRealtimeNanos();

    }



    @Override

    public long currentThreadTimeMillis() {

        return android.os.SystemClock.currentThreadTimeMillis();

    }



    @Override

    public long currentTimeMillis() {

        return System.currentTimeMillis();

    }

}

services/core/java/com/android/server/notification/NotificationManagerService.java

+197 −101

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java

+2 −1
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ public class BuzzBeepBlinkTest extends UiServiceTestCase { 
    NotificationRecordLoggerFake mNotificationRecordLogger = new NotificationRecordLoggerFake();

    private InstanceIdSequence mNotificationInstanceIdSequence = new InstanceIdSequenceFake(

            1 << 30);

    private InjectableSystemClock mSystemClock = new FakeSystemClock();



    private NotificationManagerService mService;

    private String mPkg = "com.android.server.notification";
@@ -154,7 +155,7 @@ public class BuzzBeepBlinkTest extends UiServiceTestCase { 
        assertTrue(accessibilityManager.isEnabled());



        mService = spy(new NotificationManagerService(getContext(), mNotificationRecordLogger,

                mNotificationInstanceIdSequence));

                mSystemClock, mNotificationInstanceIdSequence));

        mService.setAudioManager(mAudioManager);

        mService.setVibrator(mVibrator);

        mService.setSystemReady(true);

services/tests/uiservicestests/src/com/android/server/notification/FakeSystemClock.java

0 → 100644
+111 −0

File added.

Preview size limit exceeded, changes collapsed.