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

Commit 7a88927f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Increase the timeout for logcat logs collection for dropbox" into main

parents a2299952 323b0dbc

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

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
    static final int RESERVED_BYTES_PER_LOGCAT_LINE = 100;















    // How many seconds should the system wait before terminating the spawned logcat process.













    static final int LOGCAT_TIMEOUT_SEC = 10;













    static final int LOGCAT_TIMEOUT_SEC = Flags.logcatLongerTimeout() ? 15 : 10;





























    // Necessary ApplicationInfo flags to mark an app as persistent















    static final int PERSISTENT_MASK =

































services/core/java/com/android/server/am/flags.aconfig



+11
−0




























Original line number
Diff line number
Diff line








@@ -195,3 +195,14 @@ flag {













        purpose: PURPOSE_BUGFIX















    }















}



























flag {













    name: "logcat_longer_timeout"













    namespace: "backstage_power"













    description: "Wait longer during the logcat gathering operation"













    bug: "292533246"













    is_fixed_read_only: true













    metadata {













        purpose: PURPOSE_BUGFIX













    }













}










 No newline at end of file