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 am: 7ac78f2daf

Browse Source 
am: 9264154bee

Change-Id: If30a93ce12ee3100f6fea14f4765e3428b122ad3
This commit is contained in:
Matthew Fritze
2016-10-06 20:59:03 +00:00
committed by android-build-merger
parent c8ef13d120 9264154bee
commit 927007dd53
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;
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;
@@ -1274,7 +1275,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();