diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7a8c5c31ec7..35c4ba9fca1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10487,8 +10487,6 @@
Can’t open this app
Blocked by your credit provider
-
- If you have questions, contact your IT admin
More details
diff --git a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
index 685da03499c..cf23c94c74b 100644
--- a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
+++ b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
@@ -233,8 +233,6 @@ public class ActionDisabledByAdminDialogHelper {
final TextView textView = root.findViewById(R.id.admin_support_msg);
if (supportMessage != null) {
textView.setText(supportMessage);
- } else if (!isFinancedDevice()) {
- textView.setText(R.string.default_admin_support_msg);
}
}
diff --git a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java
index 1ff1d79b815..b245017b680 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java
@@ -194,6 +194,27 @@ public class ActionDisabledByAdminDialogHelperTest {
assertEquals("some message", Shadows.shadowOf(textView).innerText());
}
+ @Test
+ public void testSetAdminSupportDetails_shortSupportMessageIsNull() {
+ final ShadowDevicePolicyManager dpmShadow = ShadowDevicePolicyManager.getShadow();
+ final UserManager userManager = RuntimeEnvironment.application.getSystemService(
+ UserManager.class);
+ final ShadowUserManager userManagerShadow = Shadow.extract(userManager);
+ final ViewGroup view = new FrameLayout(mActivity);
+ final ComponentName component = new ComponentName("some.package.name",
+ "some.package.name.SomeClass");
+ final EnforcedAdmin admin = new EnforcedAdmin(component, UserHandle.of(123));
+ final TextView textView = createAdminSupportTextView(view, mActivity);
+ dpmShadow.setShortSupportMessageForUser(component, 123, null);
+ dpmShadow.setIsAdminActiveAsUser(true);
+ createShadowWorkProfile(userManagerShadow);
+
+ mHelper.setAdminSupportDetails(mActivity, view, admin);
+
+ assertNotNull(admin.component);
+ assertEquals("", Shadows.shadowOf(textView).innerText());
+ }
+
@Test
public void testSetAdminSupportDetailsNotAdmin() {
final ShadowDevicePolicyManager dpmShadow = ShadowDevicePolicyManager.getShadow();
@@ -212,27 +233,6 @@ public class ActionDisabledByAdminDialogHelperTest {
mHelper.setAdminSupportDetails(mActivity, textView, admin);
assertNull(admin.component);
- assertEquals(mActivity.getString(R.string.default_admin_support_msg),
- Shadows.shadowOf(textView).innerText());
- }
-
- @Test
- public void testSetAdminSupportDetailsForFinancedDevice_shortSupportMessageIsNull() {
- final ShadowDevicePolicyManager dpmShadow = ShadowDevicePolicyManager.getShadow();
- final UserManager userManager = RuntimeEnvironment.application.getSystemService(
- UserManager.class);
- final ShadowUserManager userManagerShadow = Shadow.extract(userManager);
- final ViewGroup view = new FrameLayout(mActivity);
- final ComponentName component = new ComponentName("some.package.name",
- "some.package.name.SomeClass");
- final EnforcedAdmin admin = new EnforcedAdmin(component, UserHandle.of(123));
- final TextView textView = createAdminSupportTextView(view, mActivity);
- setupFinancedDevice(dpmShadow);
- createShadowWorkProfile(userManagerShadow);
-
- mHelper.setAdminSupportDetails(mActivity, view, admin);
-
- assertNotNull(admin.component);
assertEquals("", Shadows.shadowOf(textView).innerText());
}