Prevent monkey tests from crashing with race conditions
Change-Id: I3eb7d5549aba2f9684f97e8ee7c56c469f9daae0
Fixes: 31856366
Test: None, monkey test race conditions.
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index e1f8afe..9ccdb1d 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 void startSuggestion(Intent intent) {
- if (intent == null) {
+ if (intent == null || ActivityManager.isUserAMonkey()) {
return;
}
final ComponentName componentName = intent.getComponent();