summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-build-prod@system.gserviceaccount.com>2021-08-10 18:01:13 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-08-10 18:01:13 +0000
commitb6bd2054b05bb47779c041675f34828517288d73 (patch)
tree883082882d5a28b9350b70d03298f126aabe3d6d
parentf3eb9ec38718d231131ce86ae92015c9cc673e01 (diff)
parentad433b499063fab2fcf09a22949821e2179da36d (diff)
Merge "Do not delay start of sticky foreground services" into s-keystone-qcom-dev
-rw-r--r--services/core/java/com/android/server/am/ActiveServices.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index 8c66bca942a6..b0e21570166b 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -3732,7 +3732,7 @@ public final class ActiveServices {
= !((r.serviceInfo.applicationInfo.flags&ApplicationInfo.FLAG_PERSISTENT) == 0);
if(top_rc != null) {
if(top_rc.launching && !r.shortInstanceName.contains(top_rc.packageName)
- && !isPersistent) {
+ && !isPersistent && r.isForeground == false) {
shouldDelay = true;
}
}