diff options
| author | Robin Lee <rgl@google.com> | 2014-10-20 21:46:53 +0100 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2014-10-21 10:03:16 -0700 |
| commit | 2d625bbe91d07fe1c48b8de220838d8b994c1b40 (patch) | |
| tree | 84b38ef35300a5f177b5e7fa19081235eb3d6b6a | |
| parent | e04a328b76d789d7cdaa37af8ee922590b697225 (diff) | |
| download | base-2d625bbe91d07fe1c48b8de220838d8b994c1b40.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.java | 1 |
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( |