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

Browse Source 
am: 19c7ef11bd

* commit '19c7ef11bdc649b3619f421946225d8953218fd1':
  Fix NULL instead of DPC name is displayed in Certificate warning

Change-Id: I85bb03da5e85fb401e672783295e5f545dbd10ab
This commit is contained in:
Victor Chang
2016-05-13 15:12:49 +00:00
committed by android-build-merger
parent 1bc12ee9c2 19c7ef11bd
commit 6b5c77a752
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) { if (dpm.getProfileOwnerAsUser(mUserId) != null) {
builder.setMessage(getResources().getQuantityString(R.plurals.ssl_ca_cert_info_message, builder.setMessage(getResources().getQuantityString(R.plurals.ssl_ca_cert_info_message,
numberOfCertificates, dpm.getProfileOwnerName())); numberOfCertificates, dpm.getProfileOwnerNameAsUser(mUserId)));
} else if (dpm.getDeviceOwnerComponentOnCallingUser() != null) { } else if (dpm.getDeviceOwnerComponentOnCallingUser() != null) {
builder.setMessage(getResources().getQuantityString( builder.setMessage(getResources().getQuantityString(
R.plurals.ssl_ca_cert_info_message_device_owner, numberOfCertificates, R.plurals.ssl_ca_cert_info_message_device_owner, numberOfCertificates,