diff options
| author | Robin Lee <rgl@google.com> | 2015-01-08 22:46:44 +0000 |
|---|---|---|
| committer | Robin Lee <rgl@google.com> | 2015-01-09 11:25:04 +0000 |
| commit | 7f7ea82c28f01798b15686aa45733885beebcc6e (patch) | |
| tree | a623a83f584636de7adcdfccb283291a1c1ee2f2 /services/devicepolicy | |
| parent | bde7bc45af2bb7f9bee8096d45973f25cc00c5db (diff) | |
| download | frameworks_base-7f7ea82c28f01798b15686aa45733885beebcc6e.zip frameworks_base-7f7ea82c28f01798b15686aa45733885beebcc6e.tar.gz frameworks_base-7f7ea82c28f01798b15686aa45733885beebcc6e.tar.bz2 | |
Profile owner hint in warning for extra CAs
The version of the warning with a named installer should be shown in
the case of a managed profile, not only a managed device.
Bug: 18224038
Change-Id: I27865f77e963b9b15416f2e4a4ffc38fed8f5532
Diffstat (limited to 'services/devicepolicy')
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 5e405ce..579fae4 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -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 { |