Reset priority on unbond

Ravi Nagarajan · Matthew Xie · commit 82e57fe1741e · 2012-07-26T19:20:32.000-07:00
Change-Id: I8232c666bde26235ad527c96e5218fc1b3e7a1db
diff --git a/core/java/android/bluetooth/BluetoothA2dp.java b/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;
             }
diff --git a/core/java/android/bluetooth/BluetoothHeadset.java b/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;
             }

Original file line number	Diff line number	Diff line change
`@@ -338,6 +338,7 @@ public boolean setPriority(BluetoothDevice device, int priority) {`
`338`	`338`	`&& isValidDevice(device)) {`
`339`	`339`	`if (priority != BluetoothProfile.PRIORITY_OFF &&`
`340`	`340`	`priority != BluetoothProfile.PRIORITY_ON &&`
	`341`	`+ priority != BluetoothProfile.PRIORITY_UNDEFINED &&`
`341`	`342`	`priority != BluetoothProfile.PRIORITY_AUTO_CONNECT) {`
`342`	`343`	`return false;`
`343`	`344`	`}`
Original file line number	Diff line number	Diff line change
`@@ -456,6 +456,7 @@ public boolean setPriority(BluetoothDevice device, int priority) {`
`456`	`456`	`isValidDevice(device)) {`
`457`	`457`	`if (priority != BluetoothProfile.PRIORITY_OFF &&`
`458`	`458`	`priority != BluetoothProfile.PRIORITY_ON &&`
	`459`	`+ priority != BluetoothProfile.PRIORITY_UNDEFINED &&`
`459`	`460`	`priority != BluetoothProfile.PRIORITY_AUTO_CONNECT) {`
`460`	`461`	`return false;`
`461`	`462`	`}`