Use AOSP intent for Work Policy Info
Bug: 134391103
Test: make, GTS, robotest
Change-Id: I8870621538aa7d2d4a5313efdf41119fd36daee5
diff --git a/res/values/config.xml b/res/values/config.xml
index 06a1555..4a02b97 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -415,9 +415,6 @@
<!-- List containing the injected tile keys which are suppressed. -->
<string-array name="config_suppress_injected_tile_keys" translatable="false"/>
- <!-- "Show work policy info" intent action. TODO(b/134391103): Replace with final SystemAPI intent when it's available. -->
- <string name="config_work_policy_info_intent_action" translatable="false"/>
-
<!-- Reset application package name -->
<string-array name="config_reset_app_package_name" translatable="false">
<item>com.android.systemui</item>
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
index 675795e..429c537 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
@@ -278,7 +278,7 @@
// 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))
+ new Intent(Settings.ACTION_SHOW_WORK_POLICY_INFO)
.setPackage(ownerComponent.getPackageName())
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
final List<ResolveInfo> activities = mPm.queryIntentActivities(intent, 0);
@@ -302,7 +302,7 @@
// 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))
+ new Intent(Settings.ACTION_SHOW_WORK_POLICY_INFO)
.setPackage(ownerComponent.getPackageName())
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
final List<ResolveInfo> activities = mPm.queryIntentActivitiesAsUser(intent, 0, userId);
diff --git a/tests/robotests/res/values/config.xml b/tests/robotests/res/values/config.xml
index 004ecb7..3f1c9f1 100644
--- a/tests/robotests/res/values/config.xml
+++ b/tests/robotests/res/values/config.xml
@@ -24,7 +24,4 @@
<!-- Fake dimen value for restricted icon size - needed to get around Robolectric
issue loading framework hidden resources -->
<dimen name="restricted_icon_size">24dp</dimen>
-
- <!-- Fake string to avoid empty intent action -->
- <string name="config_work_policy_info_intent_action" translatable="false">ACTION_SHOW_WORK_POLICY_INFO</string>
</resources>
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
index 429ede9..f539350 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
@@ -422,8 +422,7 @@
private Intent addWorkPolicyInfoIntent(
String packageName, boolean deviceOwner, boolean profileOwner) {
- Intent intent =
- new Intent(mResources.getString(R.string.config_work_policy_info_intent_action));
+ Intent intent = new Intent(Settings.ACTION_SHOW_WORK_POLICY_INFO);
intent.setPackage(packageName);
ResolveInfo resolveInfo = new ResolveInfo();
resolveInfo.resolvePackageName = packageName;