summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Lee <rgl@google.com>2014-10-20 21:46:53 +0100
committerRobin Lee <rgl@google.com>2014-10-20 20:55:40 +0000
commite69bdca44bbbd16b990b9be0eba24e88cbb7f8f8 (patch)
tree941e24362832d8360fe556700acea1488e024acd
parent877ce2c42b5d423719246f5458cd66fa9fddb317 (diff)
downloadbase-e69bdca44bbbd16b990b9be0eba24e88cbb7f8f8.tar.gz
DevicePolicy: Restore CA warning to K behaviour
Some tests rely on this being dismissible. Additionally it turns out some users don't like having a hulking great notification follow them around everywhere. Bug: 17985258 Change-Id: If05a07b9eaa402a48f9a14647effc1df32c796e1
-rw-r--r--services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index fe4b7b9cc949..9ee44b99876f 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 @@ 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(