summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-11-18 20:09:37 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-11-18 20:09:37 +0000
commit539bfca1c83448be68bc8b31f8fef9ff38ff0c67 (patch)
treeb3d7f2decd62809addd250404b3a2ca9fc88055e
parent062b0ff81c24c1cfd53fd2e4dcd7d82413dd33f0 (diff)
parent5fafc49d4c16bd655cea5697e04e2a6bb74b6c71 (diff)
Merge "Allow pre-warming service running in work profiles"
-rw-r--r--services/core/java/com/android/server/am/ServiceRecord.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ServiceRecord.java b/services/core/java/com/android/server/am/ServiceRecord.java
index 057b007cfb5e..364ad21b93cf 100644
--- a/services/core/java/com/android/server/am/ServiceRecord.java
+++ b/services/core/java/com/android/server/am/ServiceRecord.java
@@ -806,6 +806,7 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN
void updateKeepWarmLocked() {
mKeepWarming = ams.mConstants.KEEP_WARMING_SERVICES.contains(name)
&& (ams.mUserController.getCurrentUserId() == userId
+ || ams.mUserController.isCurrentProfile(userId)
|| ams.isSingleton(processName, appInfo, instanceName.getClassName(),
serviceInfo.flags));
}