Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7f7ea82c: Profile owner hint in warning for extra CAs

Browse Source 
* commit '7f7ea82c28f01798b15686aa45733885beebcc6e':
  Profile owner hint in warning for extra CAs
This commit is contained in:
Robin Lee
2015-01-09 15:12:24 +00:00
committed by Android Git Automerger
parent 2db79771b6 7f7ea82c28
commit 34f3adedcc
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/res/res/values/strings.xml
View File

@@ -341,11 +341,15 @@
device. Indicates to the user that SSL traffic can be intercepted. [CHAR LIMIT=NONE] -->
<string name="ssl_ca_cert_warning">Network may be monitored</string>
<!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.
i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.
[CHAR LIMIT=100]-->
<string name="ssl_ca_cert_noti_by_unknown">By an unknown third party</string>
<!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
i.e. "Network may be monitored". This indicates who is doing the monitoring.
i.e. "Network may be monitored". This indicates that an unspecified administrator is doing
the monitoring. [CHAR LIMIT=100]-->
<string name="ssl_ca_cert_noti_by_administrator">By your work profile administrator</string>
<!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
i.e. "Network may be monitored". This indicates who is doing the monitoring.
[CHAR LIMIT=100]-->
<string name="ssl_ca_cert_noti_managed">By <xliff:g id="managing_domain">%s</xliff:g></string>

1
core/res/res/values/symbols.xml
View File

@@ -1041,6 +1041,7 @@
<java-symbol type="string" name="write_fail_reason_cancelled" />
<java-symbol type="string" name="write_fail_reason_cannot_write" />
<java-symbol type="string" name="ssl_ca_cert_noti_by_unknown" />
<java-symbol type="string" name="ssl_ca_cert_noti_by_administrator" />
<java-symbol type="string" name="ssl_ca_cert_noti_managed" />
<java-symbol type="string" name="ssl_ca_cert_warning" />
<java-symbol type="string" name="work_profile_deleted" />

5
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -1694,7 +1694,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
int smallIconId;
String contentText;
final String ownerName = getDeviceOwnerName();
if (ownerName != null) {
if (isManagedProfile(userHandle.getIdentifier())) {
contentText = mContext.getString(R.string.ssl_ca_cert_noti_by_administrator);
smallIconId = R.drawable.stat_sys_certificate_info;
} else if (ownerName != null) {
contentText = mContext.getString(R.string.ssl_ca_cert_noti_managed, ownerName);
smallIconId = R.drawable.stat_sys_certificate_info;
} else {