From cec65e9423d4ed19031b2dc2a1d94f5363f7e2a1 Mon Sep 17 00:00:00 2001 From: Peter Visontay Date: Tue, 23 Jan 2018 13:27:37 +0000 Subject: [PATCH] Fix the app ops settings tests by adding FLAG_ACTIVITY_NEW_TASK to Intents. Test: make -j32 SettingsUnitTests && adb install -r out/target/product/marlin/data/app/SettingsUnitTests/SettingsUnitTests.apk && adb shell am instrument -w -e class com.android.settings.applications.ExternalSourcesSettingsTest com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner Change-Id: I187d68e6b214d975df0fe2a3d5dc88cadec35fa3 --- .../android/settings/applications/AppOpsSettingsTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.java b/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.java index d89d4a3b059..17a18890835 100644 --- a/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.java +++ b/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.java @@ -15,6 +15,9 @@ */ package com.android.settings.applications; +import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK; +import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; + import android.app.AppOpsManager; import android.content.Context; import android.content.Intent; @@ -95,7 +98,9 @@ abstract public class AppOpsSettingsTest { * Creates an intent for showing the permission settings for all apps. */ private Intent createManageAllAppsIntent() { - return new Intent(mActivityAction); + final Intent intent = new Intent(mActivityAction); + intent.addFlags(FLAG_ACTIVITY_CLEAR_TASK | FLAG_ACTIVITY_NEW_TASK); + return intent; } /**