Need to call resetFgsRestrictionLocked() before calling

setFgsRestrictionLocked() again.

Bug: 191159915
Test: atest cts/tests/app/src/android/app/cts/ActivityManagerFgsBgStartTest.java#testStartForegroundTimeout
Change-Id: Iedd6f4507fc3ac136a0f62385c0f8b49d43ff778
This commit is contained in:
Hui Yu
2021-06-15 10:27:03 -07:00
parent bea8152724
commit 779f6a10b9

View File

@@ -1790,6 +1790,7 @@ public final class ActiveServices {
if (!r.fgRequired) {
final long delayMs = SystemClock.elapsedRealtime() - r.createRealTime;
if (delayMs > mAm.mConstants.mFgsStartForegroundTimeoutMs) {
resetFgsRestrictionLocked(r);
setFgsRestrictionLocked(r.serviceInfo.packageName, r.app.getPid(),
r.appInfo.uid, r.intent.getIntent(), r, r.userId,false);
final String temp = "startForegroundDelayMs:" + delayMs;