summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Phil Burk <philburk@google.com> 2020-04-03 22:15:13 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-04-03 22:15:13 +0000
commit576e2cc6fee99e51533d55345b4563a4efe25bfc (patch)
treedfb36ce404ae9c3190f0147b86dc0536766060cb
parent5afebd9a448bfb2112ca51645a2f48570064c9c1 (diff)
parenta576959497e78b4094dbe901f39699b8e6326ffe (diff)
Merge "BluetoothMidi: ignore reserved bit in header" into rvc-dev
-rw-r--r--media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothPacketDecoder.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothPacketDecoder.java b/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothPacketDecoder.java
index c51c8fa73c4e..8d18b77700b5 100644
--- a/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothPacketDecoder.java
+++ b/media/packages/BluetoothMidiService/src/com/android/bluetoothmidiservice/BluetoothPacketDecoder.java
@@ -70,7 +70,9 @@ public class BluetoothPacketDecoder extends PacketDecoder {
}
byte header = buffer[0];
- if ((header & 0xC0) != 0x80) {
+ // Check for the header bit 7.
+ // Ignore the reserved bit 6.
+ if ((header & 0x80) != 0x80) {
Log.e(TAG, "packet does not start with header");
return;
}