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

Author: Matthew Xie

core/java/android/bluetooth/BluetoothA2dp.java

@@ -338,6 +338,7 @@ public boolean setPriority(BluetoothDevice device, int priority) {
             && 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

@@ -456,6 +456,7 @@ public boolean setPriority(BluetoothDevice device, int priority) {
             isValidDevice(device)) {
             if (priority != BluetoothProfile.PRIORITY_OFF &&
                 priority != BluetoothProfile.PRIORITY_ON &&
+                priority != BluetoothProfile.PRIORITY_UNDEFINED &&
                 priority != BluetoothProfile.PRIORITY_AUTO_CONNECT) {
               return false;
             }