From 242ff568d10b4816576fd1c1cf909649754ff06f Mon Sep 17 00:00:00 2001 From: Ivan Podogov Date: Thu, 20 Jun 2019 16:01:29 +0100 Subject: [PATCH] Fix Settings crash when trying to show work policy info This fixes an exception in startActivity() call: "android.util.AndroidRuntimeException: Calling startActivity() from outside of an Activity context requires the FLAG_ACTIVITY_NEW_TASK flag. Is this really what you want?" Bug: 132904820 Test: manual Change-Id: I0c687ea76068778554b072b6cc8274352de6fa28 --- .../enterprise/EnterprisePrivacyFeatureProviderImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java index d095d880385..675795e7549 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java @@ -279,7 +279,8 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe // Only search for the required action in the Device Owner's package final Intent intent = new Intent(mResources.getString(R.string.config_work_policy_info_intent_action)) - .setPackage(ownerComponent.getPackageName()); + .setPackage(ownerComponent.getPackageName()) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); final List activities = mPm.queryIntentActivities(intent, 0); if (activities.size() != 0) { return intent; @@ -302,7 +303,8 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe // Only search for the required action in the Profile Owner's package final Intent intent = new Intent(mResources.getString(R.string.config_work_policy_info_intent_action)) - .setPackage(ownerComponent.getPackageName()); + .setPackage(ownerComponent.getPackageName()) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); final List activities = mPm.queryIntentActivitiesAsUser(intent, 0, userId); if (activities.size() != 0) { return intent;