diff options
| author | 2024-05-01 18:28:42 +0000 | |
|---|---|---|
| committer | 2024-05-01 18:28:42 +0000 | |
| commit | d920ce1ae1cc41afeec149751dde848ef3d4f5db (patch) | |
| tree | 59b4c8442ced76d7cc7fe558a928f000399f4c49 | |
| parent | 872ce8d2048971108bdf829249cea05499e5da5a (diff) | |
| parent | 6c4d71f23ae471db573a71ea0b6575d182cb205e (diff) | |
Merge "Update wording of onTimeout javadoc." into main
| -rw-r--r-- | core/java/android/app/Service.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/app/Service.java b/core/java/android/app/Service.java index 9b3fb5c73415..726064e39778 100644 --- a/core/java/android/app/Service.java +++ b/core/java/android/app/Service.java @@ -1198,17 +1198,18 @@ public abstract class Service extends ContextWrapper implements ComponentCallbac * Callback called when a particular foreground service type has timed out. * * <p>This callback is meant to give the app a small grace period of a few seconds to finish - * the foreground service of the offending type - if it fails to do so, the app will be + * the foreground service of the associated type - if it fails to do so, the app will be * declared an ANR. * - * <p>The foreground service of the offending type can be stopped within the time limit by + * <p>The foreground service of the associated type can be stopped within the time limit by * {@link android.app.Service#stopSelf()}, * {@link android.content.Context#stopService(android.content.Intent)} or their overloads. * {@link android.app.Service#stopForeground(int)} can be used as well, which demotes the * service to a "background" service, which will soon be stopped by the system. * * <p>The specific time limit for each type (if one exists) is mentioned in the documentation - * for that foreground service type. + * for that foreground service type. See + * {@link ServiceInfo#FOREGROUND_SERVICE_TYPE_DATA_SYNC dataSync} for example. * * <p>Note: time limits are restricted to a rolling 24-hour window - for example, if a * foreground service type has a time limit of 6 hours, that time counter begins as soon as the |