summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2021-06-03 09:17:18 -0700
committerChristopher Tate <ctate@google.com>2021-06-03 09:28:07 -0700
commit29f1852efd836b803d09002b41a1926871950379 (patch)
tree98685004e31f820e59e684a7347e4a609fb20a67 /core/java/android
parent10de71a3807af1d36b9b1f47a31363a71e1db2f5 (diff)
Fix FGS enter/exit statslog semantics
Logging wasn't quite right in the case of deferred FGS notification in various ordering scenarios. Bug: 189926836 Test: atest CtsStatsdAtomHostTestCases:android.cts.statsdatom.statsd.UidAtomTests#testForegroundServiceState Change-Id: I650730db9e01faa90a36a73b486464ab5b179fc6
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/ActivityManagerInternal.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/app/ActivityManagerInternal.java b/core/java/android/app/ActivityManagerInternal.java
index d962fa3bc316..25fd254cd9f6 100644
--- a/core/java/android/app/ActivityManagerInternal.java
+++ b/core/java/android/app/ActivityManagerInternal.java
@@ -486,11 +486,11 @@ public abstract class ActivityManagerInternal {
/**
* Callback from the notification subsystem that the given FGS notification has
- * been shown or updated. This can happen after either Service.startForeground()
- * or NotificationManager.notify().
+ * been evaluated, and either shown or explicitly overlooked. This can happen
+ * after either Service.startForeground() or NotificationManager.notify().
*/
- public abstract void onForegroundServiceNotificationUpdate(Notification notification,
- int id, String pkg, @UserIdInt int userId);
+ public abstract void onForegroundServiceNotificationUpdate(boolean shown,
+ Notification notification, int id, String pkg, @UserIdInt int userId);
/**
* If the given app has any FGSs whose notifications are in the given channel,