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

Commit 98d6853f authored May 27, 2020 by Evan Laird

DO NOT MERGE: Allow interrupting notifications to bypass lifetime extension

Notifications which have interruped the UI (usually a HUN) can safely
bypass FGS lifetime extension because the system has done the best it
can to show the user this notification.

This valve is important in particular for things like a dialer which
might want to interrupt a user but need to do so again on the same
channel, for instance when getting multiple phone calls quickly in
succession.

Bug: 155594347
Bug: 119041698
Test: atest ForegroundServiceNotificationListenerTest
Change-Id: Id80fba3191cc133d1e73ca04015f9cbed62fc086

parent cec677ac

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -66,6 +66,12 @@ public class ForegroundServiceLifetimeExtender implements NotificationLifetimeEx
		return false;
		}

		// Entry has triggered a HUN or some other interruption, therefore it has been seen and the
		// interrupter might be retaining it anyway.
		if (entry.hasInterrupted()) {
		return false;
		}

		boolean hasInteracted = mInteractionTracker.hasUserInteractedWith(entry.key);
		long aliveTime = mSystemClock.uptimeMillis() - entry.getCreationTime();
		return aliveTime < MIN_FGS_TIME_MS && !hasInteracted;

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -100,4 +100,16 @@ public class ForegroundServiceNotificationListenerTest extends SysuiTestCase {
		mClock.advanceTime(MIN_FGS_TIME_MS + 1);
		assertFalse(mExtender.shouldExtendLifetime(mEntry));
		}

		@Test
		public void testShouldExtendLifetime_shouldNot_interruped() {
		// GIVEN a notification that would trigger lifetime extension
		mNotif.flags \|= Notification.FLAG_FOREGROUND_SERVICE;

		// GIVEN the notification has alerted
		mEntry.setInterruption();

		// THEN the notification does not need to have its lifetime extended by this extender
		assertFalse(mExtender.shouldExtendLifetime(mEntry));
		}
		}