Merge "Mark uid as non-idle/FG-entitled when launching for fg service" into oc-mr1-dev

2017-09-19 19:50:42 +00:00
parent 14b86be8da 1536cc27b9
commit 93243bf808
1 changed files with 9 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -2162,6 +2162,15 @@ public final class ActiveServices {
            }
        }

+        if (r.fgRequired) {
+            if (DEBUG_FOREGROUND_SERVICE) {
+                Slog.v(TAG, "Whitelisting " + UserHandle.formatUid(r.appInfo.uid)
+                        + " for fg-service launch");
+            }
+            mAm.tempWhitelistUidLocked(r.appInfo.uid,
+                    SERVICE_START_FOREGROUND_TIMEOUT, "fg-service-launch");
+        }
+
        if (!mPendingServices.contains(r)) {
            mPendingServices.add(r);
        }