Merge "Remove default admin support message for an Enterprise device" into sc-dev

2021-03-10 00:21:37 +00:00
parent 48f6ec410e 52565ad5e9
commit b687a9757c
3 changed files with 21 additions and 25 deletions
--- 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);
        }
    }