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

Merge "Fix race in short FGS timeout"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-12-07 22:48:05 +00:00
committed by Android (Google) Code Review
parent 98652d2598 fbc260728d
commit 516f5731eb
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2981,6 +2981,9 @@ public final class ActiveServices {
void onShortFgsTimeout(ServiceRecord sr) {
synchronized (mAm) {
if (!sr.shouldTriggerShortFgsTimeout()) {
if (DEBUG_SHORT_SERVICE) {
Slog.d(TAG_SERVICE, "[STALE] Short FGS timed out: " + sr);
}
return;
}
Slog.e(TAG_SERVICE, "Short FGS timed out: " + sr);
@@ -3021,6 +3024,9 @@ public final class ActiveServices {
tr.mLatencyTracker.waitingOnAMSLockEnded();
if (!sr.shouldTriggerShortFgsAnr()) {
if (DEBUG_SHORT_SERVICE) {
Slog.d(TAG_SERVICE, "[STALE] Short FGS ANR'ed: " + sr);
}
return;
}

4
services/core/java/com/android/server/am/ServiceRecord.java
View File

@@ -1416,7 +1416,7 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN
|| !mShortFgsInfo.isCurrent()) {
return false;
}
return mShortFgsInfo.getTimeoutTime() < SystemClock.uptimeMillis();
return mShortFgsInfo.getTimeoutTime() <= SystemClock.uptimeMillis();
}
/**
@@ -1431,7 +1431,7 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN
|| !mShortFgsInfo.isCurrent()) {
return false;
}
return mShortFgsInfo.getAnrTime() < SystemClock.uptimeMillis();
return mShortFgsInfo.getAnrTime() <= SystemClock.uptimeMillis();
}
private boolean isAppAlive() {