Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78a99ed6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Need to call resetFgsRestrictionLocked() before calling... 

Merge "Need to call resetFgsRestrictionLocked() before calling setFgsRestrictionLocked() again." into sc-dev am: d26ab5ef am: 7d590911 am: 1b32ee55

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14981904

Change-Id: I3db730181cb8807bd50232ea8af82ea01e6c9734
parents dd6edf52 1b32ee55

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

+1 −0
Original line number Diff line number Diff line
@@ -1791,6 +1791,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;