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

Commit 07035f59 authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Extend the BIND_APPLICATION_TIMEOUT" into udc-qpr-dev am: 70842392 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25104249



Change-Id: I2f17954131eaec3d945b41d2640a157d58c5e817
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a73a5f7a 70842392

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

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
    static final int PROC_START_TIMEOUT = 10 * 1000 * Build.HW_TIMEOUT_MULTIPLIER;















    // How long we wait for a launched process to complete its app startup before we ANR.













    static final int BIND_APPLICATION_TIMEOUT = 10 * 1000 * Build.HW_TIMEOUT_MULTIPLIER;













    static final int BIND_APPLICATION_TIMEOUT = 20 * 1000 * Build.HW_TIMEOUT_MULTIPLIER;





























    // How long we wait to kill an application zygote, after the last process using















    // it has gone away.