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

Commit 54a7d4a8 authored by Wenhao Wang's avatar Wenhao Wang Committed by Automerger Merge Worker
Browse files

Merge "LogcatManagerService: Diff timeout for debuggable" into tm-dev am: 19694bbf 

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

Change-Id: I631ff1e5179540be373102fd1383ec8eff9a8b49
parents 5c9ac9cd 19694bbf

services/core/java/com/android/server/logcat/LogAccessDialogActivity.java

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