| commit | de7df08cdad2094ffaaa02c047acd76c05a2f224 | [log] [tgz] |
|---|---|---|
| author | Robin Lee <rgl@google.com> | Wed Oct 22 02:00:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 22 02:00:38 2014 +0000 |
| tree | de9746c5827c4e79423f11407f746ce0919c499a | |
| parent | a6372b3be4d114c2082d83bbd065a0439f9feb2f [diff] | |
| parent | fc56790085463ab410a5f407a4930b42509ad5f7 [diff] |
am fc567900: am e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev * commit 'fc56790085463ab410a5f407a4930b42509ad5f7': DevicePolicy: Restore CA warning to K behaviour
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index fe4b7b9..9ee44b9 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -1687,7 +1687,6 @@ .setContentTitle(mContext.getString(R.string.ssl_ca_cert_warning)) .setContentText(contentText) .setContentIntent(notifyIntent) - .setOngoing(true) .setPriority(Notification.PRIORITY_HIGH) .setShowWhen(false) .setColor(mContext.getResources().getColor(