Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afa5ae5f authored by Robin Lee's avatar Robin Lee Committed by android-build-merger
Browse files

am de7df08c: am fc567900: am e1c9489c: Merge "DevicePolicy: Restore CA warning...

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

* commit 'bd4f2a47':
  DevicePolicy: Restore CA warning to K behaviour
parents 37f3b0ad bd4f2a47
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -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(