commit d1023e847630450cfc0892300c93e595102e36d3
author Lorenzo Colitti <lorenzo@google.com> Wed Oct 21 02:28:06 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 21 02:28:06 2015 +0000
tree 892137ea0644485442b31fe6fc526751443ab8d7
parent 818b1622e779c10fd730e56fc00cac8370da0a56
parent aea9258396724c9fc75247ce332aeaff6524cf6a

Merge "Don\'t buzz when automatically connecting to captive portals" into mnc-dr-dev am: d214496319 am: 5c09f31e49 am: 18ec0b5187
am: aea9258396

* commit 'aea9258396724c9fc75247ce332aeaff6524cf6a':
  Don't buzz when automatically connecting to captive portals

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index d031165..b9759dd 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3366,7 +3366,7 @@
                     .setPriority(highPriority ?
                             Notification.PRIORITY_HIGH :
                             Notification.PRIORITY_DEFAULT)
-                    .setDefaults(Notification.DEFAULT_ALL)
+                    .setDefaults(highPriority ? Notification.DEFAULT_ALL : 0)
                     .setOnlyAlertOnce(true)
                     .build();