Merge "Fix the app ops settings tests by adding FLAG_ACTIVITY_NEW_TASK to Intents."
diff --git a/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.java b/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.java
index d89d4a3..17a1889 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 @@
* 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;
}
/**