Skip to content

Commit 302afb9

Browse files
Matthew XieAndroid (Google) Code Review
authored andcommitted
Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1
2 parents 1125f89 + 0901e60 commit 302afb9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

core/java/android/server/BluetoothEventLoop.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -784,12 +784,12 @@ private void onAgentAuthorize(String objectPath, String deviceUuid, int nativeD
784784
// machine. We don't handle AVCTP signals currently. We only send
785785
// intents for AVDTP state changes. We need to handle both of them in
786786
// some cases. For now, just don't move to incoming state in this case.
787-
mBluetoothService.notifyIncomingA2dpConnection(address, true);
787+
mBluetoothService.notifyIncomingA2dpConnection(address, false);
788788
} else {
789789
Log.i(TAG, "" + authorized +
790790
"Incoming A2DP / AVRCP connection from " + address);
791791
mA2dp.allowIncomingConnect(device, authorized);
792-
mBluetoothService.notifyIncomingA2dpConnection(address, false);
792+
mBluetoothService.notifyIncomingA2dpConnection(address, true);
793793
}
794794
} else if (BluetoothUuid.isInputDevice(uuid)) {
795795
// We can have more than 1 input device connected.

0 commit comments

Comments
 (0)