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

Commit c9e29b86 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change SHORT_SERVICE timeout to 3 minutes"

parents 64ecf87b 3ce822b1

core/java/android/content/pm/ServiceInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -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).

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

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