diff options
| author | Robin Lee <rgl@google.com> | 2014-10-21 11:54:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-21 11:54:52 +0000 |
| commit | e1c9489cc40542bfa2adbb84b6fb77cff4ab8570 (patch) | |
| tree | 84b38ef35300a5f177b5e7fa19081235eb3d6b6a | |
| parent | 2fa604fc59ded63a416066a0bc66f63069cae7f3 (diff) | |
| parent | e69bdca44bbbd16b990b9be0eba24e88cbb7f8f8 (diff) | |
| download | base-e1c9489cc40542bfa2adbb84b6fb77cff4ab8570.tar.gz | |
Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev
| -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( |