summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chia-chi Yeh <chiachi@android.com> 2012-01-12 14:24:30 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2012-01-12 14:24:30 -0800
commitff321d496a6a07fc667112ecfe4d9a107d44147b (patch)
treefda89338361f2ebbc5bc9a8fa7333b54466d1cd2
parentaaaafca8543eaa75f1865d70c801c9b62caa56e2 (diff)
parent50fe709995d1f126e96cafde133bc4777b31d4ed (diff)
Merge "VPN: silence VPN notifications." into ics-mr1
-rw-r--r--services/java/com/android/server/connectivity/Vpn.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/connectivity/Vpn.java b/services/java/com/android/server/connectivity/Vpn.java
index 72cf51253479..a76e70fe7940 100644
--- a/services/java/com/android/server/connectivity/Vpn.java
+++ b/services/java/com/android/server/connectivity/Vpn.java
@@ -322,7 +322,7 @@ public class Vpn extends INetworkManagementEventObserver.Stub {
.setContentTitle(title)
.setContentText(text)
.setContentIntent(VpnConfig.getIntentForStatusPanel(mContext, config))
- .setDefaults(Notification.DEFAULT_ALL)
+ .setDefaults(0)
.setOngoing(true)
.getNotification();
nm.notify(R.drawable.vpn_connected, notification);