From c5346baaa255f77438d31743dc1e82fe5c2e0f72 Mon Sep 17 00:00:00 2001 From: arangelov Date: Thu, 7 Oct 2021 19:26:23 +0100 Subject: [PATCH] Don't start DPC with the FLAG_ACTIVITY_NEW_TASK flag The flag prevents the DPC screen from showing with the in-app transition. Fixes: 198422800 Test: manual Change-Id: Ie6debb55396eb5ce48a21b1ef52c89612b1c7ffd --- .../EnterprisePrivacyFeatureProvider.java | 4 +++- .../EnterprisePrivacyFeatureProviderImpl.java | 12 +++++------- .../WorkPolicyInfoPreferenceController.java | 2 +- .../EnterprisePrivacyFeatureProviderImplTest.java | 14 +++++++------- .../WorkPolicyInfoPreferenceControllerTest.java | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java index 7d28d82954c..75d4517d5d2 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java @@ -16,6 +16,8 @@ package com.android.settings.enterprise; +import android.content.Context; + import java.util.Date; public interface EnterprisePrivacyFeatureProvider { @@ -131,7 +133,7 @@ public interface EnterprisePrivacyFeatureProvider { * Launches the Device Owner or Profile Owner's activity that displays the "Your work policy * info" page. Returns {@code true} if the activity has indeed been launched. */ - boolean showWorkPolicyInfo(); + boolean showWorkPolicyInfo(Context activityContext); /** * Launches the parental controls settings page. Returns {@code true} if the activity has diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java index 7d722fcd1b0..35ce1f11b03 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java @@ -227,17 +227,17 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe } @Override - public boolean showWorkPolicyInfo() { + public boolean showWorkPolicyInfo(Context activityContext) { Intent intent = getWorkPolicyInfoIntentDO(); if (intent != null) { - mContext.startActivity(intent); + activityContext.startActivity(intent); return true; } intent = getWorkPolicyInfoIntentPO(); final UserInfo userInfo = getManagedProfileUserInfo(); if (intent != null && userInfo != null) { - mContext.startActivityAsUser(intent, userInfo.getUserHandle()); + activityContext.startActivityAsUser(intent, userInfo.getUserHandle()); return true; } @@ -305,8 +305,7 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe // Only search for the required action in the Device Owner's package final Intent intent = new Intent(Settings.ACTION_SHOW_WORK_POLICY_INFO) - .setPackage(ownerComponent.getPackageName()) - .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + .setPackage(ownerComponent.getPackageName()); final List activities = mPm.queryIntentActivities(intent, 0); if (activities.size() != 0) { return intent; @@ -329,8 +328,7 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe // Only search for the required action in the Profile Owner's package final Intent intent = new Intent(Settings.ACTION_SHOW_WORK_POLICY_INFO) - .setPackage(ownerComponent.getPackageName()) - .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + .setPackage(ownerComponent.getPackageName()); final List activities = mPm.queryIntentActivitiesAsUser(intent, 0, userId); if (activities.size() != 0) { return intent; diff --git a/src/com/android/settings/privacy/WorkPolicyInfoPreferenceController.java b/src/com/android/settings/privacy/WorkPolicyInfoPreferenceController.java index 45c2c21d57b..977d1bf79e9 100644 --- a/src/com/android/settings/privacy/WorkPolicyInfoPreferenceController.java +++ b/src/com/android/settings/privacy/WorkPolicyInfoPreferenceController.java @@ -45,7 +45,7 @@ public class WorkPolicyInfoPreferenceController extends BasePreferenceController @Override public boolean handlePreferenceTreeClick(Preference preference) { if (TextUtils.equals(getPreferenceKey(), preference.getKey())) { - mEnterpriseProvider.showWorkPolicyInfo(); + mEnterpriseProvider.showWorkPolicyInfo(preference.getContext()); return true; } return false; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java index e3cd5d201b8..e3f58f4e4af 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java @@ -356,7 +356,7 @@ public class EnterprisePrivacyFeatureProviderImplTest { addWorkPolicyInfoIntent(mOwner.getPackageName(), true, false); assertThat(mProvider.hasWorkPolicyInfo()).isFalse(); - assertThat(mProvider.showWorkPolicyInfo()).isFalse(); + assertThat(mProvider.showWorkPolicyInfo(mContext)).isFalse(); verify(mContext, never()).startActivity(any()); } @@ -365,12 +365,12 @@ public class EnterprisePrivacyFeatureProviderImplTest { // If the intent is not resolved, then there's no info to show for DO when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(mOwner); assertThat(mProvider.hasWorkPolicyInfo()).isFalse(); - assertThat(mProvider.showWorkPolicyInfo()).isFalse(); + assertThat(mProvider.showWorkPolicyInfo(mContext)).isFalse(); // If the intent is resolved, then we can use it to launch the activity Intent intent = addWorkPolicyInfoIntent(mOwner.getPackageName(), true, false); assertThat(mProvider.hasWorkPolicyInfo()).isTrue(); - assertThat(mProvider.showWorkPolicyInfo()).isTrue(); + assertThat(mProvider.showWorkPolicyInfo(mContext)).isTrue(); verify(mContext).startActivity(intentEquals(intent)); } @@ -382,12 +382,12 @@ public class EnterprisePrivacyFeatureProviderImplTest { // If the intent is not resolved, then there's no info to show for PO assertThat(mProvider.hasWorkPolicyInfo()).isFalse(); - assertThat(mProvider.showWorkPolicyInfo()).isFalse(); + assertThat(mProvider.showWorkPolicyInfo(mContext)).isFalse(); // If the intent is resolved, then we can use it to launch the activity in managed profile Intent intent = addWorkPolicyInfoIntent(mOwner.getPackageName(), false, true); assertThat(mProvider.hasWorkPolicyInfo()).isTrue(); - assertThat(mProvider.showWorkPolicyInfo()).isTrue(); + assertThat(mProvider.showWorkPolicyInfo(mContext)).isTrue(); verify(mContext) .startActivityAsUser( intentEquals(intent), @@ -402,12 +402,12 @@ public class EnterprisePrivacyFeatureProviderImplTest { // If the intent is not resolved, then there's no info to show for COMP assertThat(mProvider.hasWorkPolicyInfo()).isFalse(); - assertThat(mProvider.showWorkPolicyInfo()).isFalse(); + assertThat(mProvider.showWorkPolicyInfo(mContext)).isFalse(); // If the intent is resolved, then we can use it to launch the activity for device owner Intent intent = addWorkPolicyInfoIntent(mOwner.getPackageName(), true, true); assertThat(mProvider.hasWorkPolicyInfo()).isTrue(); - assertThat(mProvider.showWorkPolicyInfo()).isTrue(); + assertThat(mProvider.showWorkPolicyInfo(mContext)).isTrue(); verify(mContext).startActivity(intentEquals(intent)); } diff --git a/tests/robotests/src/com/android/settings/privacy/WorkPolicyInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/privacy/WorkPolicyInfoPreferenceControllerTest.java index a92e11eb95d..79aec301e17 100644 --- a/tests/robotests/src/com/android/settings/privacy/WorkPolicyInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/privacy/WorkPolicyInfoPreferenceControllerTest.java @@ -80,7 +80,7 @@ public class WorkPolicyInfoPreferenceControllerTest { final Preference pref = new Preference(mContext); assertThat(controller.handlePreferenceTreeClick(pref)).isFalse(); - verify(mEnterpriseProvider, never()).showWorkPolicyInfo(); + verify(mEnterpriseProvider, never()).showWorkPolicyInfo(mContext); } @Test @@ -92,6 +92,6 @@ public class WorkPolicyInfoPreferenceControllerTest { final Preference pref = new Preference(mContext); pref.setKey(controller.getPreferenceKey()); assertThat(controller.handlePreferenceTreeClick(pref)).isTrue(); - verify(mEnterpriseProvider).showWorkPolicyInfo(); + verify(mEnterpriseProvider).showWorkPolicyInfo(mContext); } }