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

Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev am: 19c7ef11bd am: 2c41dea8b3

Browse Source 
am: 1eb6b46304

* commit '1eb6b46304f26d5b8d5b956a8d9852e473bf4cae':
  Fix NULL instead of DPC name is displayed in Certificate warning

Change-Id: Ic086a7d10107e7d752d41c3118ec3453047b1210
This commit is contained in:
Victor Chang
2016-05-13 15:17:49 +00:00
committed by android-build-merger
parent b12079a7f1 1eb6b46304
commit fd965b82bc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,7 +60,7 @@ public class MonitoringCertInfoActivity extends Activity implements OnClickListe
if (dpm.getProfileOwnerAsUser(mUserId) != null) {
builder.setMessage(getResources().getQuantityString(R.plurals.ssl_ca_cert_info_message,
numberOfCertificates, dpm.getProfileOwnerName()));
numberOfCertificates, dpm.getProfileOwnerNameAsUser(mUserId)));
} else if (dpm.getDeviceOwnerComponentOnCallingUser() != null) {
builder.setMessage(getResources().getQuantityString(
R.plurals.ssl_ca_cert_info_message_device_owner, numberOfCertificates,