diff options
| author | 2016-05-11 14:43:13 +0000 | |
|---|---|---|
| committer | 2016-05-11 14:43:15 +0000 | |
| commit | 090b5a8e8c6cbe069c9818eda25b1976da6426a9 (patch) | |
| tree | 569c9dc63d866de6b947d37bc99de8aa9af59b72 | |
| parent | f09f0699369c02a6a46fbff68c02b00a7c703697 (diff) | |
| parent | 8560a7c2a1681276ccf8cb04dfd02bfea6251af4 (diff) | |
Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index d0128b743767..3cc3edf82802 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -2701,10 +2701,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { // Build and show a warning notification int smallIconId; String contentText; + int parentUserId = userHandle.getIdentifier(); if (getProfileOwner(userHandle.getIdentifier()) != null) { contentText = mContext.getString(R.string.ssl_ca_cert_noti_managed, getProfileOwnerName(userHandle.getIdentifier())); smallIconId = R.drawable.stat_sys_certificate_info; + parentUserId = getProfileParentId(userHandle.getIdentifier()); } else if (getDeviceOwnerUserId() == userHandle.getIdentifier()) { contentText = mContext.getString(R.string.ssl_ca_cert_noti_managed, getDeviceOwnerName()); @@ -2716,12 +2718,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { final int numberOfCertificates = pendingCertificates.size(); Intent dialogIntent = new Intent(Settings.ACTION_MONITORING_CERT_INFO); - dialogIntent.setFlags( - Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); + dialogIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); dialogIntent.setPackage("com.android.settings"); dialogIntent.putExtra(Settings.EXTRA_NUMBER_OF_CERTIFICATES, numberOfCertificates); + dialogIntent.putExtra(Intent.EXTRA_USER_ID, userHandle.getIdentifier()); PendingIntent notifyIntent = PendingIntent.getActivityAsUser(mContext, 0, - dialogIntent, PendingIntent.FLAG_UPDATE_CURRENT, null, userHandle); + dialogIntent, PendingIntent.FLAG_UPDATE_CURRENT, null, + new UserHandle(parentUserId)); final Context userContext; try { |