summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2015-10-21 09:15:41 +0900
committerLorenzo Colitti <lorenzo@google.com>2015-10-21 09:59:31 +0900
commit46d50b708de20e2a26a61ba516c524841b4e11dc (patch)
tree171b7f43e9fa49e8397f73513e5ee30cf880bf62
parentd8ef44bc51a4a27cd9a57c880a367636a1377082 (diff)
downloadframeworks_base-46d50b708de20e2a26a61ba516c524841b4e11dc.zip
frameworks_base-46d50b708de20e2a26a61ba516c524841b4e11dc.tar.gz
frameworks_base-46d50b708de20e2a26a61ba516c524841b4e11dc.tar.bz2
Don't buzz when automatically connecting to captive portals
Play a sound and vibrate (by setting DEFAULT_ALL) only if the user manually selected the network. This applies to both captive portals and networks with no Internet access. Bug: 24126143 Change-Id: Idf075d5c85f9f4b07a3431a25d1a3f7089cf1ee2
-rw-r--r--services/core/java/com/android/server/ConnectivityService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 4c03143..3860005 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3363,7 +3363,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
.setPriority(highPriority ?
Notification.PRIORITY_HIGH :
Notification.PRIORITY_DEFAULT)
- .setDefaults(Notification.DEFAULT_ALL)
+ .setDefaults(highPriority ? Notification.DEFAULT_ALL : 0)
.setOnlyAlertOnce(true)
.build();