From 7ac78f2daf482a121bc17018653f187147f1bdf6 Mon Sep 17 00:00:00 2001
From: Matthew Fritze <mfritze@google.com>
Date: Mon, 3 Oct 2016 13:26:07 -0700
Subject: [PATCH] Prevent monkey tests from crashing with race conditions

Change-Id: I3eb7d5549aba2f9684f97e8ee7c56c469f9daae0
Fixes: 31856366
Test: None, monkey test race conditions.
---
 src/com/android/settings/SettingsActivity.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index e1f8afef6ec..9ccdb1db312 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -16,10 +16,11 @@
 
 package com.android.settings;
 
-import android.app.ActionBar;
+import android.app.ActivityManager;
 import android.app.Fragment;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
+import android.app.ActionBar;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
@@ -1269,7 +1270,7 @@ public class SettingsActivity extends SettingsDrawerActivity
     }
 
     public void startSuggestion(Intent intent) {
-        if (intent == null) {
+        if (intent == null || ActivityManager.isUserAMonkey()) {
             return;
         }
         final ComponentName componentName = intent.getComponent();