Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ba5df0d0: Merge "Prevent monkey from triggering bugreport" into lmp-dev

Browse Source 
* commit 'ba5df0d01970ec97d64397d9db55f8d1ad98aa16':
  Prevent monkey from triggering bugreport
This commit is contained in:
Guang Zhu
2014-10-03 19:44:27 +00:00
committed by Android Git Automerger
parent 5ebb0e6a1e ba5df0d019
commit 35eb89097f
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
policy/src/com/android/internal/policy/impl/GlobalActions.java
View File

@@ -23,6 +23,7 @@ import com.android.internal.telephony.TelephonyProperties;
import com.android.internal.R; import com.android.internal.R;
import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils;
import android.app.ActivityManager;
import android.app.ActivityManagerNative; import android.app.ActivityManagerNative;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
@@ -370,6 +371,11 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { 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 // Add a little delay before executing, to give the
// dialog a chance to go away before it takes a // dialog a chance to go away before it takes a
// screenshot. // screenshot.