PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent monkey tests from crashing with race conditions

Browse Source 
am: 7ac78f2daf

Change-Id: I6634fa0ac2b4b5712f18db7320f82f595381ce1a
This commit is contained in:
Matthew Fritze
2016-10-06 20:27:36 +00:00
committed by android-build-merger
parent ffae7d82c3 7ac78f2daf
commit 9264154bee
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/SettingsActivity.java
View File

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