From cba033e4b528bf16499ce5b121693007a5fd2010 Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Fri, 13 May 2016 14:42:17 +0100 Subject: [PATCH] Fix NULL instead of DPC name is displayed in Certificate warning Bug: 28752118 Change-Id: I5a6e17efd92aaea5188d83f2ccb7e7b8d1f1dc1b --- src/com/android/settings/MonitoringCertInfoActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/MonitoringCertInfoActivity.java b/src/com/android/settings/MonitoringCertInfoActivity.java index 0111ae7e99f..b5bf2570d03 100644 --- a/src/com/android/settings/MonitoringCertInfoActivity.java +++ b/src/com/android/settings/MonitoringCertInfoActivity.java @@ -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, numberOfCertificates, dpm.getDeviceOwnerNameOnAnyUser()));