From f5b2fea636e862fb1c055485c799741d44ecb60c Mon Sep 17 00:00:00 2001
From: Victor Chang <vichang@google.com>
Date: Mon, 9 May 2016 11:32:42 +0100
Subject: [PATCH] Show a different Root CA string for device owner

Bug: 28627835
Change-Id: Iab750dbe7099336b664ef66892cbf2c1b89a9e8e
---
 res/values/strings.xml                                   | 7 ++++++-
 src/com/android/settings/MonitoringCertInfoActivity.java | 5 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1be7f9bb91f..a540a8f7157 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5299,7 +5299,12 @@
         <item quantity="one">Trust or remove certificate</item>
         <item quantity="other">Trust or remove certificates</item>
     </plurals>
-    <!-- Text of message to show to users whose administrator has installed a SSL CA Cert.  [CHAR LIMIT=NONE] -->
+    <!-- Text of message to show to device owner user whose administrator has installed a SSL CA Cert.  [CHAR LIMIT=NONE] -->
+    <plurals name="ssl_ca_cert_info_message_device_owner">
+        <item quantity="one"><xliff:g id="managing_domain">%s</xliff:g> has installed a certificate authority on your device, which may allow them to monitor your device network activity, including emails, apps, and secure websites. You can choose to either trust or remove this certificate.\n\nFor more information about this certificate, contact your admin.</item>
+        <item quantity="other"><xliff:g id="managing_domain">%s</xliff:g> has installed certificate authorities on your device, which may allow them to monitor your device network activity, including emails, apps, and secure websites. You can choose to either trust or remove these certificates.\n\nFor more information about these certificates, contact your admin.</item>
+    </plurals>
+    <!-- Text of message to show to work profile users whose administrator has installed a SSL CA Cert.  [CHAR LIMIT=NONE] -->
     <plurals name="ssl_ca_cert_info_message">
         <item quantity="one"><xliff:g id="managing_domain">%s</xliff:g> has installed a certificate authority for your work profile, which may allow them to monitor work network activity, including emails, apps, and secure websites. You can choose to either trust or remove this certificate.\n\nFor more information about this certificate, contact your admin.</item>
         <item quantity="other"><xliff:g id="managing_domain">%s</xliff:g> has installed certificate authorities for your work profile, which may allow them to monitor work network activity, including emails, apps, and secure websites. You can choose to either trust or remove these certificates.\n\nFor more information about these certificates, contact your admin.</item>
diff --git a/src/com/android/settings/MonitoringCertInfoActivity.java b/src/com/android/settings/MonitoringCertInfoActivity.java
index 7bf57680941..9df34134aca 100644
--- a/src/com/android/settings/MonitoringCertInfoActivity.java
+++ b/src/com/android/settings/MonitoringCertInfoActivity.java
@@ -57,8 +57,9 @@ public class MonitoringCertInfoActivity extends Activity implements OnClickListe
             builder.setMessage(getResources().getQuantityString(R.plurals.ssl_ca_cert_info_message,
                     numberOfCertificates, dpm.getProfileOwnerName()));
         } else if (dpm.getDeviceOwnerComponentOnCallingUser() != null) {
-            builder.setMessage(getResources().getQuantityString(R.plurals.ssl_ca_cert_info_message,
-                    numberOfCertificates, dpm.getDeviceOwnerNameOnAnyUser()));
+            builder.setMessage(getResources().getQuantityString(
+                    R.plurals.ssl_ca_cert_info_message_device_owner, numberOfCertificates,
+                    dpm.getDeviceOwnerNameOnAnyUser()));
         } else  {
             // Consumer case.  Show scary warning.
             builder.setIcon(android.R.drawable.stat_notify_error);