am e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev

* commit 'e1c9489cc40542bfa2adbb84b6fb77cff4ab8570': DevicePolicy: Restore CA warning to K behaviour
2014-10-21 11:58:38 +00:00
parent deddb38462 e1c9489cc4
commit fc56790085
1 changed files with 0 additions and 1 deletions
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -1687,7 +1687,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
                .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(