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

Commit 323b0dbc authored by Mohamad Mahmoud's avatar Mohamad Mahmoud
Browse files

Increase the timeout for logcat logs collection for dropbox 

Bug: 292533246
Test: manual testing
Flag: logcat_longer_timeout
Change-Id: I9a915610378d476e4574f47396d343cfeaac1dfd
parent 76136b03

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

+2 −2
Original line number Diff line number Diff line
@@ -418,7 +418,6 @@ import com.android.internal.util.FastPrintWriter; 
import com.android.internal.util.FrameworkStatsLog;

import com.android.internal.util.MemInfoReader;

import com.android.internal.util.Preconditions;

import com.android.server.crashrecovery.CrashRecoveryHelper;

import com.android.server.AlarmManagerInternal;

import com.android.server.BootReceiver;

import com.android.server.DeviceIdleInternal;
@@ -438,6 +437,7 @@ import com.android.server.am.LowMemDetector.MemFactor; 
import com.android.server.appop.AppOpsService;

import com.android.server.compat.PlatformCompat;

import com.android.server.contentcapture.ContentCaptureManagerInternal;

import com.android.server.crashrecovery.CrashRecoveryHelper;

import com.android.server.criticalevents.CriticalEventLog;

import com.android.server.firewall.IntentFirewall;

import com.android.server.graphics.fonts.FontManagerInternal;
@@ -575,7 +575,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