commit 365d95b69a6e87a04d15e2af85fb8275ae3dd56e
author Lorenzo Colitti <lorenzo@google.com> Mon Oct 03 23:37:09 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 03 23:37:10 2016 +0000
tree 3886847883cb312f00bbe0ce52b22a9ea55ccf78
parent 7ac78f2daf482a121bc17018653f187147f1bdf6
parent b01c080b086d77c3f1f75e92c4096198411b2aef

Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev

src/com/android/settings/SettingsActivity.java

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();