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

Commit 9830b5a8 authored by Dan Sandler's avatar Dan Sandler Committed by Daniel Sandler
Browse files

Give fg services a shelf life before they go bad. 

When a fg service starts (as indicated by its presence in a
NOTE_FOREGROUND_SERVICES notification), we note the service
start time (as encoded in Notification.when in ActivityMgr).

SysUI will suppress the dungeon (foreground service
disclosure) notification until 5 seconds have elapsed since
the earliest service start time. After that, if the service
is still running, the disclosure will be shown.

Bug: 67819284
Test: runtest -x frameworks/base/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceControllerTest.java
Change-Id: I5b6df95eb673e2f551aaa3ecc5a7df617f815a90
parent 43d5d86c

packages/SystemUI/src/com/android/systemui/ForegroundServiceControllerImpl.java

+12 −4
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ import java.util.Arrays; 
 */

public class ForegroundServiceControllerImpl

        implements ForegroundServiceController {

  

    // shelf life of foreground services before they go bad

    public static final long FG_SERVICE_GRACE_MILLIS = 5000;



    private static final String TAG = "FgServiceController";

    private static final boolean DBG = false;
@@ -72,7 +76,7 @@ public class ForegroundServiceControllerImpl 
            if (isDungeonNotification(sbn)) {

                // if you remove the dungeon entirely, we take that to mean there are

                // no running services

                userServices.setRunningServices(null);

                userServices.setRunningServices(null, 0);

                return true;

            } else {

                // this is safe to call on any notification, not just FLAG_FOREGROUND_SERVICE
@@ -94,7 +98,7 @@ public class ForegroundServiceControllerImpl 
                final Bundle extras = sbn.getNotification().extras;

                if (extras != null) {

                    final String[] svcs = extras.getStringArray(Notification.EXTRA_FOREGROUND_APPS);

                    userServices.setRunningServices(svcs); // null ok

                    userServices.setRunningServices(svcs, sbn.getNotification().when);

                }

            } else {

                userServices.removeNotification(sbn.getPackageName(), sbn.getKey());
@@ -118,9 +122,11 @@ public class ForegroundServiceControllerImpl 
     */

    private static class UserServices {

        private String[] mRunning = null;

        private long mServiceStartTime = 0;

        private ArrayMap<String, ArraySet<String>> mNotifications = new ArrayMap<>(1);

        public void setRunningServices(String[] pkgs) {

        public void setRunningServices(String[] pkgs, long serviceStartTime) {

            mRunning = pkgs != null ? Arrays.copyOf(pkgs, pkgs.length) : null;

            mServiceStartTime = serviceStartTime;

        }

        public void addNotification(String pkg, String key) {

            if (mNotifications.get(pkg) == null) {
@@ -142,7 +148,9 @@ public class ForegroundServiceControllerImpl 
            return found;

        }

        public boolean isDungeonNeeded() {

            if (mRunning != null) {

            if (mRunning != null

                && System.currentTimeMillis() - mServiceStartTime >= FG_SERVICE_GRACE_MILLIS) {



                for (String pkg : mRunning) {

                    final ArraySet<String> set = mNotifications.get(pkg);

                    if (set == null || set.size() == 0) {

packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceControllerTest.java

+1 −0
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ public class ForegroundServiceControllerTest extends SysuiTestCase { 
        final Bundle extras = new Bundle();

        if (pkgs != null) extras.putStringArray(Notification.EXTRA_FOREGROUND_APPS, pkgs);

        n.extras = extras;

        n.when = System.currentTimeMillis() - 10000; // ten seconds ago

        final StatusBarNotification sbn = makeMockSBN(userid, "android",

                SystemMessageProto.SystemMessage.NOTE_FOREGROUND_SERVICES,

                null, n);