commit 539bfca1c83448be68bc8b31f8fef9ff38ff0c67
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Nov 18 20:09:37 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 18 20:09:37 2020 +0000
tree b3d7f2decd62809addd250404b3a2ca9fc88055e
parent 062b0ff81c24c1cfd53fd2e4dcd7d82413dd33f0
parent 5fafc49d4c16bd655cea5697e04e2a6bb74b6c71

Merge "Allow pre-warming service running in work profiles"

services/core/java/com/android/server/am/ServiceRecord.java

diff --git a/services/core/java/com/android/server/am/ServiceRecord.java b/services/core/java/com/android/server/am/ServiceRecord.java
index 057b007c..364ad21 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 @@
     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));
     }