PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Settings crash when trying to show work policy info

Browse Source 
am: 242ff568d1

Change-Id: I2a048e75934dda54d4b495908f07016e9c00b674
This commit is contained in:
Ivan Podogov
2019-06-20 15:34:39 -07:00
committed by android-build-merger
parent 2c01fb911c 242ff568d1
commit 9de5b04dea
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
View File

@@ -279,7 +279,8 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe
// Only search for the required action in the Device Owner's package // Only search for the required action in the Device Owner's package
final Intent intent = final Intent intent =
new Intent(mResources.getString(R.string.config_work_policy_info_intent_action)) 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<ResolveInfo> activities = mPm.queryIntentActivities(intent, 0); final List<ResolveInfo> activities = mPm.queryIntentActivities(intent, 0);
if (activities.size() != 0) { if (activities.size() != 0) {
return intent; return intent;
@@ -302,7 +303,8 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe
// Only search for the required action in the Profile Owner's package // Only search for the required action in the Profile Owner's package
final Intent intent = final Intent intent =
new Intent(mResources.getString(R.string.config_work_policy_info_intent_action)) 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<ResolveInfo> activities = mPm.queryIntentActivitiesAsUser(intent, 0, userId); final List<ResolveInfo> activities = mPm.queryIntentActivitiesAsUser(intent, 0, userId);
if (activities.size() != 0) { if (activities.size() != 0) {
return intent; return intent;