Merge "Fix FGS notification mismatch" into sc-dev am: 9eed97ac10 am: fa49c40843

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15226946

Change-Id: Ie56b95c04aa2e050da8e5d133683996fd11933fa
This commit is contained in:
Amith Yamasani
2021-07-09 02:15:59 +00:00
committed by Automerger Merge Worker
4 changed files with 26 additions and 9 deletions

View File

@@ -486,7 +486,7 @@ public abstract class ActivityManagerInternal {
* not associated with an FGS; ensure display; or only update if already displayed.
*/
public abstract ServiceNotificationPolicy applyForegroundServiceNotification(
Notification notification, int id, String pkg, @UserIdInt int userId);
Notification notification, String tag, int id, String pkg, @UserIdInt int userId);
/**
* Callback from the notification subsystem that the given FGS notification has