From 98a881418a33dd4331ba864727d26c9fb0e2175f Mon Sep 17 00:00:00 2001 From: Guang Zhu Date: Fri, 3 Oct 2014 12:23:43 -0700 Subject: [PATCH] Prevent monkey from triggering bugreport Change-Id: Ifa6f06f7dfa63b740352ad7388f33911649afcb0 --- .../src/com/android/internal/policy/impl/GlobalActions.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/policy/src/com/android/internal/policy/impl/GlobalActions.java b/policy/src/com/android/internal/policy/impl/GlobalActions.java index dfcdaa083b22b..b0b2886fcdb4d 100644 --- a/policy/src/com/android/internal/policy/impl/GlobalActions.java +++ b/policy/src/com/android/internal/policy/impl/GlobalActions.java @@ -23,6 +23,7 @@ import com.android.internal.telephony.TelephonyProperties; import com.android.internal.R; import com.android.internal.widget.LockPatternUtils; +import android.app.ActivityManager; import android.app.ActivityManagerNative; import android.app.AlertDialog; import android.app.Dialog; @@ -370,6 +371,11 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { + // don't actually trigger the bugreport if we are running stability + // tests via monkey + if (ActivityManager.isUserAMonkey()) { + return; + } // Add a little delay before executing, to give the // dialog a chance to go away before it takes a // screenshot.