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

Merge "Change SHORT_SERVICE timeout to 3 minutes"

Browse Source
This commit is contained in:
TreeHugger Robot
2023-01-24 06:04:42 +00:00
committed by Android (Google) Code Review
parent 64ecf87bb4 3ce822b1ba
commit c9e29b86aa
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/pm/ServiceInfo.java
View File

@@ -388,7 +388,7 @@ public class ServiceInfo extends ComponentInfo
*
* <ul>
* <li>
* The type has a 1 minute timeout.
* The type has a 3 minute timeout.
* A foreground service of this type must be stopped within the timeout by
* {@link android.app.Service#stopSelf),
* or {@link android.content.Context#stopService).

2
services/core/java/com/android/server/am/ActivityManagerConstants.java
View File

@@ -951,7 +951,7 @@ final class ActivityManagerConstants extends ContentObserver {
"short_fgs_timeout_duration";
/** @see #KEY_SHORT_FGS_TIMEOUT_DURATION */
static final long DEFAULT_SHORT_FGS_TIMEOUT_DURATION = 60_000;
static final long DEFAULT_SHORT_FGS_TIMEOUT_DURATION = 3 * 60_000;
/** @see #KEY_SHORT_FGS_TIMEOUT_DURATION */
public volatile long mShortFgsTimeoutDuration = DEFAULT_SHORT_FGS_TIMEOUT_DURATION;