diff options
| author | Robin Lee <rgl@google.com> | 2014-10-21 11:58:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-21 11:58:38 +0000 |
| commit | fc56790085463ab410a5f407a4930b42509ad5f7 (patch) | |
| tree | 58ce3732d71419aa8f22d4867ebd73bb4654b36a | |
| parent | deddb38462389823c194559052c4d64ee6c3b467 (diff) | |
| parent | e1c9489cc40542bfa2adbb84b6fb77cff4ab8570 (diff) | |
| download | frameworks_base-fc56790085463ab410a5f407a4930b42509ad5f7.zip frameworks_base-fc56790085463ab410a5f407a4930b42509ad5f7.tar.gz frameworks_base-fc56790085463ab410a5f407a4930b42509ad5f7.tar.bz2 | |
am e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev
* commit 'e1c9489cc40542bfa2adbb84b6fb77cff4ab8570':
DevicePolicy: Restore CA warning to K behaviour
| -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 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 @@ 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( |