From fe03bdf7d7feadcf5e4affffe5b0990efe2fab7c Mon Sep 17 00:00:00 2001 From: Wenhao Wang Date: Fri, 11 Mar 2022 16:12:00 -0800 Subject: [PATCH] LogcatManagerService: Diff timeout for debuggable Set a shorter timeout (1 min) for debuggable builds. The timeout for user build is still 5 min. Bug: 197901557 Test: manually Ignore-AOSP-First: pending fix for logcat privacy issue Change-Id: Ia01062d67cb9b300e5bebc4eb0dbe86ec445798e --- .../com/android/server/logcat/LogAccessDialogActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/logcat/LogAccessDialogActivity.java b/services/core/java/com/android/server/logcat/LogAccessDialogActivity.java index 7116ca30c5a90..8be90e0cc6220 100644 --- a/services/core/java/com/android/server/logcat/LogAccessDialogActivity.java +++ b/services/core/java/com/android/server/logcat/LogAccessDialogActivity.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.RemoteException; @@ -56,7 +57,7 @@ public class LogAccessDialogActivity extends Activity implements private AlertDialog.Builder mAlertDialog; private AlertDialog mAlert; - private static final int DIALOG_TIME_OUT = 300000; + private static final int DIALOG_TIME_OUT = Build.IS_DEBUGGABLE ? 60000 : 300000; private static final int MSG_DISMISS_DIALOG = 0;