PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Show a different Root CA string for device owner" into nyc-dev

Browse Source 
am: 9c31684bbe

* commit '9c31684bbe449e320e5174a2fcee4ab1900e182c':
  Show a different Root CA string for device owner

Change-Id: I1d22ab807c576483ffc29cc459e7c321a38fb1a1
This commit is contained in:
Victor Chang
2016-05-10 14:35:53 +00:00
committed by android-build-merger
parent 2318d40fc3 9c31684bbe
commit 5296dbca73
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/values/strings.xml
View File

@@ -5320,7 +5320,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>

5
src/com/android/settings/MonitoringCertInfoActivity.java
View File

@@ -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);