Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "resetFgsRestrictionLocked() must be called AFTER logFGSStateChangeLocked()." into sc-dev

Browse Source
This commit is contained in:
Hui Yu
2021-06-05 02:46:25 +00:00
committed by Android (Google) Code Review
parent de90ce294c a6c9fe409c
commit 4ba381fd83
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -1930,7 +1930,6 @@ public final class ActiveServices {
decActiveForegroundAppLocked(smap, r); decActiveForegroundAppLocked(smap, r);
} }
r.isForeground = false; r.isForeground = false;
resetFgsRestrictionLocked(r);
r.mFgsExitTime = SystemClock.uptimeMillis(); r.mFgsExitTime = SystemClock.uptimeMillis();
ServiceState stracker = r.getTracker(); ServiceState stracker = r.getTracker();
if (stracker != null) { if (stracker != null) {
@@ -1945,6 +1944,7 @@ public final class ActiveServices {
FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__EXIT, FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED__STATE__EXIT,
r.mFgsExitTime > r.mFgsEnterTime r.mFgsExitTime > r.mFgsEnterTime
? (int)(r.mFgsExitTime - r.mFgsEnterTime) : 0); ? (int)(r.mFgsExitTime - r.mFgsEnterTime) : 0);
resetFgsRestrictionLocked(r);
mAm.updateForegroundServiceUsageStats(r.name, r.userId, false); mAm.updateForegroundServiceUsageStats(r.name, r.userId, false);
if (r.app != null) { if (r.app != null) {
mAm.updateLruProcessLocked(r.app, false, null); mAm.updateLruProcessLocked(r.app, false, null);
@@ -4192,8 +4192,7 @@ public final class ActiveServices {
r.isForeground = false; r.isForeground = false;
r.foregroundId = 0; r.foregroundId = 0;
r.foregroundNoti = null; r.foregroundNoti = null;
r.mAllowWhileInUsePermissionInFgs = false; resetFgsRestrictionLocked(r);
r.mAllowStartForeground = REASON_DENIED;
// Clear start entries. // Clear start entries.
r.clearDeliveredStartsLocked(); r.clearDeliveredStartsLocked();