diff options
| author | 2024-05-09 22:32:19 +0000 | |
|---|---|---|
| committer | 2024-05-09 22:32:19 +0000 | |
| commit | 4f549327a01b79a2ed705a54ded9cdbd10ba2e7b (patch) | |
| tree | c0410a6286190a9c95c6eebe084f2979bb2df8b7 | |
| parent | eb81e130a9380f427a9377e5138f6d15d7e44436 (diff) | |
| parent | 69475c45f752bfe6a4099b3b3e86280d73235200 (diff) | |
Merge "Allow BG-FGS start on BOOT_COMPLETED if it's exempted for other reasons" into main
| -rw-r--r-- | services/core/java/com/android/server/am/ActiveServices.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index d77670038e2c..bef5c6125551 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -1168,9 +1168,7 @@ public final class ActiveServices { } private boolean shouldAllowBootCompletedStart(ServiceRecord r, int foregroundServiceType) { - @PowerExemptionManager.ReasonCode final int fgsStartReasonCode = - r.mInfoTempFgsAllowListReason != null ? r.mInfoTempFgsAllowListReason.mReasonCode - : REASON_DENIED; + @PowerExemptionManager.ReasonCode final int fgsStartReasonCode = r.getFgsAllowStart(); if (Flags.fgsBootCompleted() && CompatChanges.isChangeEnabled(FGS_BOOT_COMPLETED_RESTRICTIONS, r.appInfo.uid) && fgsStartReasonCode == PowerExemptionManager.REASON_BOOT_COMPLETED) { |