diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-10-21 01:10:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-21 01:10:10 +0000 |
| commit | d214496319785311f99f8415b7c8be3189420488 (patch) | |
| tree | 517ac3ff958dce3b738cfb7d6bdcba61167b011d /services | |
| parent | 55d2b6e8e6f364e2fd52c45b5fa3eb6a56082456 (diff) | |
| parent | 46d50b708de20e2a26a61ba516c524841b4e11dc (diff) | |
| download | frameworks_base-d214496319785311f99f8415b7c8be3189420488.zip frameworks_base-d214496319785311f99f8415b7c8be3189420488.tar.gz frameworks_base-d214496319785311f99f8415b7c8be3189420488.tar.bz2 | |
Merge "Don't buzz when automatically connecting to captive portals" into mnc-dr-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 2 |
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(); |