Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ensure notification visibility on stopForeground(false)" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-20 22:05:26 +00:00
committed by Android (Google) Code Review
parent c19b69571c 075de7ea1d
commit 2591e466c1
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -1934,6 +1934,28 @@ public final class ActiveServices {
if (smap != null) { if (smap != null) {
decActiveForegroundAppLocked(smap, r); decActiveForegroundAppLocked(smap, r);
} }
// Adjust notification handling before setting isForeground to false, because
// that state is relevant to the notification policy side.
// Leave the time-to-display as already set: re-entering foreground mode will
// only resume the previous quiet timeout, or will display immediately if the
// deferral period had already passed.
if ((flags & Service.STOP_FOREGROUND_REMOVE) != 0) {
cancelForegroundNotificationLocked(r);
r.foregroundId = 0;
r.foregroundNoti = null;
} else if (r.appInfo.targetSdkVersion >= Build.VERSION_CODES.LOLLIPOP) {
// if it's been deferred, force to visibility
if (!r.mFgsNotificationShown) {
r.postNotification();
}
dropFgsNotificationStateLocked(r);
if ((flags & Service.STOP_FOREGROUND_DETACH) != 0) {
r.foregroundId = 0;
r.foregroundNoti = null;
}
}
r.isForeground = false; r.isForeground = false;
r.mFgsExitTime = SystemClock.uptimeMillis(); r.mFgsExitTime = SystemClock.uptimeMillis();
ServiceState stracker = r.getTracker(); ServiceState stracker = r.getTracker();
@@ -1957,20 +1979,6 @@ public final class ActiveServices {
updateServiceForegroundLocked(r.app.mServices, true); updateServiceForegroundLocked(r.app.mServices, true);
} }
} }
// Leave the time-to-display as already set: re-entering foreground mode will
// only resume the previous quiet timeout, or will display immediately if the
// deferral period had already passed.
if ((flags & Service.STOP_FOREGROUND_REMOVE) != 0) {
cancelForegroundNotificationLocked(r);
r.foregroundId = 0;
r.foregroundNoti = null;
} else if (r.appInfo.targetSdkVersion >= Build.VERSION_CODES.LOLLIPOP) {
dropFgsNotificationStateLocked(r);
if ((flags & Service.STOP_FOREGROUND_DETACH) != 0) {
r.foregroundId = 0;
r.foregroundNoti = null;
}
}
} }
} }