commit ada1f638b67f47f1cfc88a89c150c2383fefcfff
author Matthew Xie <mattx@google.com> Thu Jul 26 21:15:24 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 26 21:15:24 2012 -0700
tree 462d653fba972fd9ccf00b1411da7ccfdffdc1bd
parent 1103d0056c18dda032772df57d9b141b730b7fa0
parent 82e57fe1741e225a65bc69004ae12cbbdfae5737

Merge "Reset priority on unbond" into jb-mr1-dev

core/java/android/bluetooth/BluetoothA2dp.java

diff --git a/core/java/android/bluetooth/BluetoothA2dp.java b/core/java/android/bluetooth/BluetoothA2dp.java
index 74f634b..1b415e5 100755
--- a/core/java/android/bluetooth/BluetoothA2dp.java
+++ b/core/java/android/bluetooth/BluetoothA2dp.java
@@ -338,6 +338,7 @@
             && isValidDevice(device)) {
             if (priority != BluetoothProfile.PRIORITY_OFF &&
                 priority != BluetoothProfile.PRIORITY_ON &&
+                priority != BluetoothProfile.PRIORITY_UNDEFINED &&
                 priority != BluetoothProfile.PRIORITY_AUTO_CONNECT) {
               return false;
             }

core/java/android/bluetooth/BluetoothHeadset.java

diff --git a/core/java/android/bluetooth/BluetoothHeadset.java b/core/java/android/bluetooth/BluetoothHeadset.java
index 75dfe9d..8e6ebaf 100755
--- a/core/java/android/bluetooth/BluetoothHeadset.java
+++ b/core/java/android/bluetooth/BluetoothHeadset.java
@@ -456,6 +456,7 @@
             isValidDevice(device)) {
             if (priority != BluetoothProfile.PRIORITY_OFF &&
                 priority != BluetoothProfile.PRIORITY_ON &&
+                priority != BluetoothProfile.PRIORITY_UNDEFINED &&
                 priority != BluetoothProfile.PRIORITY_AUTO_CONNECT) {
               return false;
             }