Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9264154b authored by Matthew Fritze's avatar Matthew Fritze Committed by android-build-merger
Browse files

Prevent monkey tests from crashing with race conditions

am: 7ac78f2d

Change-Id: I6634fa0ac2b4b5712f18db7320f82f595381ce1a
parents ffae7d82 7ac78f2d
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -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();