OSDN Git Service
johnshamoon [Fri, 11 Aug 2017 06:03:20 +0000 (06:03 +0000)]
Merge "test_vendor: Add function to extract bytes from iterators" am:
9a7f50c041 am:
1dcc643f74
am:
8d47bcb5e1
Change-Id: Ia448deb3ab32f43166bba4402f27fb17dbcf408a
johnshamoon [Fri, 11 Aug 2017 05:59:20 +0000 (05:59 +0000)]
Merge "test_vendor: Add function to extract bytes from iterators" am:
9a7f50c041
am:
1dcc643f74
Change-Id: I5d1f05416df73f3d3f6432a6e1f506fc544a238f
johnshamoon [Fri, 11 Aug 2017 05:54:20 +0000 (05:54 +0000)]
Merge "test_vendor: Add function to extract bytes from iterators"
am:
9a7f50c041
Change-Id: I588d3a7fd6dce5c2eaf1aea9944e4d45663e3dd0
Treehugger Robot [Fri, 11 Aug 2017 05:46:08 +0000 (05:46 +0000)]
Merge "test_vendor: Add function to extract bytes from iterators"
johnshamoon [Wed, 9 Aug 2017 03:38:28 +0000 (20:38 -0700)]
test_vendor: Add function to extract bytes from iterators
The extract function extracts a number of bytes from the type that the
iterator is pointing to. The iterator will be incremented to the value
after the last byte after extract is called.
Fixed the bounds of the for loop in the preIncrementTest so that it
does not try to dereference the sentinel after the last value.
Test: Passes unit tests in test/iterator_test.cc
Change-Id: I07944641b829c820bbe40d612d7f065e514516b3
Ting-Yuan Huang [Thu, 10 Aug 2017 18:28:24 +0000 (18:28 +0000)]
osi: Suppress length warning in config parsing am:
8b7968085b am:
1b63c106d4
am:
a079f052da
Change-Id: I73b0cee3d1ad82c061fd7b9d725160ce86da193e
Ting-Yuan Huang [Thu, 10 Aug 2017 18:20:47 +0000 (18:20 +0000)]
osi: Suppress length warning in config parsing am:
8b7968085b
am:
1b63c106d4
Change-Id: I6d38fee565d635ba2a9ca89ac3b078b654e3d182
Ting-Yuan Huang [Thu, 10 Aug 2017 18:13:18 +0000 (18:13 +0000)]
osi: Suppress length warning in config parsing
am:
8b7968085b
Change-Id: I338ec794dcc5db22ee4615ef139500c44eb1cf2b
Ting-Yuan Huang [Tue, 9 May 2017 23:35:46 +0000 (16:35 -0700)]
osi: Suppress length warning in config parsing
Bug:
38178471
Test: Built without seeing the warning at the line
Change-Id: I1f8a5fc58313456921891700a3039cad1715b4d0
Jakub Pawlowski [Wed, 9 Aug 2017 16:23:37 +0000 (16:23 +0000)]
resolve merge conflicts of
0a5d9ebb0b15976b47eaff77bb66a257b8b114bb to stage-aosp-master am:
ca61556a76
am:
fe37b1e8f8
Change-Id: Idf45696c975e3c65d955e9a19c446bb471900536
Jakub Pawlowski [Wed, 9 Aug 2017 16:06:57 +0000 (16:06 +0000)]
resolve merge conflicts of
0a5d9ebb0b15976b47eaff77bb66a257b8b114bb to stage-aosp-master
am:
ca61556a76
Change-Id: I7d93c7bfd2fdd3bb0b80e0ef5400dd2432e035ac
Jakub Pawlowski [Wed, 9 Aug 2017 07:44:01 +0000 (00:44 -0700)]
resolve merge conflicts of
0a5d9ebb0b15976b47eaff77bb66a257b8b114bb to stage-aosp-master
Test: this fixes merge conflict that I skipped
Change-Id: Ie829182b01d01e5ae648165f30cfad7647a97db6
Merged-In: Ie829182b01d01e5ae648165f30cfad7647a97db5
Jakub Pawlowski [Wed, 9 Aug 2017 07:36:40 +0000 (07:36 +0000)]
Bluetooth: move AIDL files related to Bluetooth into system/bt (2/3) am:
0a5d9ebb0b am:
0cc11eea12
am:
3bf1fb856e
Change-Id: Ibee12f6369a62bedc0a6175c8e5e02e91beb69e0
Jakub Pawlowski [Wed, 9 Aug 2017 07:25:31 +0000 (07:25 +0000)]
Bluetooth: move AIDL files related to Bluetooth into system/bt (2/3) am:
0a5d9ebb0b
am:
0cc11eea12
Change-Id: Ia96a68b8c9fe6d070a917a7749ade226e7994d9d
Jakub Pawlowski [Wed, 9 Aug 2017 07:13:47 +0000 (07:13 +0000)]
Bluetooth: move AIDL files related to Bluetooth into system/bt (2/3)
am:
0a5d9ebb0b
Change-Id: I6a921b05aa32dbb9bf196635c17118de5d39d2b0
Jakub Pawlowski [Tue, 8 Aug 2017 11:00:13 +0000 (04:00 -0700)]
Bluetooth: move AIDL files related to Bluetooth into system/bt (2/3)
This patch moves *.aidl files from
frameworks/base/core/java/android/bluetooth into system/bt/binder. This
is in preparation to convert the Bluetooth deamon into native
implementation piece by piece.
In order to do that, one must have C++ header files, and paths to them
with AIDL files, and */java/* folder didn't seem as proper place for
that. Additionally, keeping AIDL files out of framework/base will not
require creating dependency on this huge project, which should help
keeping the compilation fast.
Test: compilation test
Change-Id: I4c992e6ee16eea3173a49b1d37e961af3d3c9ac6
Merged-In: I4c992e6ee16eea3173a49b1d37e961af3d3c9ac6
(cherry picked from commit
8a12de49177a341a118c95435177fba4f12fe412)
Bailey Forrest [Mon, 7 Aug 2017 23:03:45 +0000 (23:03 +0000)]
Merge "Call bta_dm_sp_cback if BTM_LOCAL_IO_CAPS == BTM_IO_CAP_NONE" am:
9d098408ce am:
4a09400364
am:
ad3e4d8347
Change-Id: Id67303ca15e4f0e7649682c08fd54f34871f532c
Bailey Forrest [Mon, 7 Aug 2017 23:01:45 +0000 (23:01 +0000)]
Merge "Call bta_dm_sp_cback if BTM_LOCAL_IO_CAPS == BTM_IO_CAP_NONE" am:
9d098408ce
am:
4a09400364
Change-Id: I45dd43d6311339a67da18007176bd8c620c19487
Bailey Forrest [Mon, 7 Aug 2017 22:58:14 +0000 (22:58 +0000)]
Merge "Call bta_dm_sp_cback if BTM_LOCAL_IO_CAPS == BTM_IO_CAP_NONE"
am:
9d098408ce
Change-Id: I0988507f1ed8bd3a9138ecb80171d7cfd18a4031
Treehugger Robot [Mon, 7 Aug 2017 22:49:25 +0000 (22:49 +0000)]
Merge "Call bta_dm_sp_cback if BTM_LOCAL_IO_CAPS == BTM_IO_CAP_NONE"
Jakub Pawlowski [Mon, 7 Aug 2017 21:33:32 +0000 (21:33 +0000)]
Advertisement parsing fix for zero padding
am:
436058ee3f -s ours
Change-Id: I8c586ba7ba15a21d69bb2c6efab8040f3a661960
Jakub Pawlowski [Fri, 4 Aug 2017 15:56:53 +0000 (08:56 -0700)]
Advertisement parsing fix for zero padding
When AD data is zero padded, and Scan Response is appended at end, data
becomes invalid. Instead, zero paddning must be removed first.
Test: AdvertiseDataParserTest.RemoveTrailingZeros
Bug:
38489707
Change-Id: I229ca3db6c92bc06bc1429e72412417010721063
Merged-In: I229ca3db6c92bc06bc1429e72412417010721063
(cherry picked from commit
35a9ea352d59e6d261eba1254814f7238e3ed022)
Android Build Merger (Role) [Mon, 7 Aug 2017 18:17:57 +0000 (18:17 +0000)]
Merge "Use a mutex to protect the scheduling of tBTA_PM_TIMER am:
a8ba0bd7c8" into oc-dr1-dev-plus-aosp
Pavlin Radoslavov [Mon, 7 Aug 2017 18:17:28 +0000 (18:17 +0000)]
Use a mutex to protect the scheduling of tBTA_PM_TIMER
am:
a8ba0bd7c8
Change-Id: Id221742b47d96bcf0d4e80ce83a9e7b3cb02940c
Pavlin Radoslavov [Mon, 7 Aug 2017 18:17:21 +0000 (18:17 +0000)]
Use a mutex to protect the scheduling of tBTA_PM_TIMER am:
9e702a6aef am:
a6ba2c3c0a
am:
c68fce56d0
Change-Id: I5d95919b21c8c1ecd24595105967d20cf947206a
Pavlin Radoslavov [Mon, 7 Aug 2017 18:13:45 +0000 (18:13 +0000)]
Use a mutex to protect the scheduling of tBTA_PM_TIMER am:
9e702a6aef
am:
a6ba2c3c0a
Change-Id: Ifc72953b703d4203b5271a922a64802a9d27e255
Pavlin Radoslavov [Mon, 7 Aug 2017 18:09:44 +0000 (18:09 +0000)]
Use a mutex to protect the scheduling of tBTA_PM_TIMER
am:
9e702a6aef
Change-Id: I4f41eee8b9e5dd129b3aeffb287a6e8b9c7269c4
johnshamoon [Mon, 7 Aug 2017 18:09:40 +0000 (18:09 +0000)]
Merge "test_vendor: Add Iterator tests" am:
c427c0bd30 am:
ef20e0dbb8
am:
4bdb823460
Change-Id: Ic5fd2a95a9177f8abd1628d5addfab3b87b7bf05
Pavlin Radoslavov [Sun, 6 Aug 2017 06:47:50 +0000 (23:47 -0700)]
Use a mutex to protect the scheduling of tBTA_PM_TIMER
Bug:
63689331
Test: Code compilation
Change-Id: If062f7b3e2c17cb5a1ac2c8ef0813a2fe5c5a5f5
johnshamoon [Mon, 7 Aug 2017 17:58:19 +0000 (17:58 +0000)]
Merge "test_vendor: Add Iterator tests" am:
c427c0bd30
am:
ef20e0dbb8
Change-Id: I17f91bc17978fc21f68d464c5b7c6df979ecbccb
johnshamoon [Mon, 7 Aug 2017 17:55:20 +0000 (17:55 +0000)]
Merge "test_vendor: Add Iterator tests"
am:
c427c0bd30
Change-Id: I81d51453b88f707463b140861dfd0b6e0dcefb50
Treehugger Robot [Mon, 7 Aug 2017 17:42:41 +0000 (17:42 +0000)]
Merge "test_vendor: Add Iterator tests"
Pavlin Radoslavov [Sun, 6 Aug 2017 06:47:50 +0000 (23:47 -0700)]
Use a mutex to protect the scheduling of tBTA_PM_TIMER
Bug:
63689331
Test: Code compilation
Change-Id: If062f7b3e2c17cb5a1ac2c8ef0813a2fe5c5a5f5
(cherry picked from commit
a34d33ff2a3fe3562c1e003d870a0716f83568bf)
Pavlin Radoslavov [Fri, 4 Aug 2017 22:14:30 +0000 (22:14 +0000)]
Protect the btif config state with a lock during cleanup
am:
ecadb0d01d
Change-Id: I9186219a5f21505921e7fa4a749ad1ff72879148
johnshamoon [Fri, 4 Aug 2017 22:08:03 +0000 (22:08 +0000)]
test_vendor: Use Custom Iterators in L2CAP Classes am:
6f1401153f am:
590df2b3f1
am:
6acf4aacf5
Change-Id: Iaed989f6bd0f2c1679a568c610f9f36f1110769a
johnshamoon [Fri, 4 Aug 2017 22:02:04 +0000 (22:02 +0000)]
test_vendor: Use Custom Iterators in L2CAP Classes am:
6f1401153f
am:
590df2b3f1
Change-Id: I1949b8181ea1c3c5b4bebbb111a316f2e2e9b76d
johnshamoon [Fri, 4 Aug 2017 21:56:01 +0000 (21:56 +0000)]
test_vendor: Use Custom Iterators in L2CAP Classes
am:
6f1401153f
Change-Id: Ie5fcdbe89d35ab391fd756f675b264d1dd2233ed
johnshamoon [Wed, 26 Jul 2017 17:28:07 +0000 (10:28 -0700)]
test_vendor: Use Custom Iterators in L2CAP Classes
Use custom bounded iterators instead of vector iterators in L2capPacket and
L2capSdu.
Test: Passes unit tests in test/l2cap_test.cc
Change-Id: I892083ec6155b18c4b222f3c38d17d2d9fef686c
johnshamoon [Fri, 4 Aug 2017 20:27:23 +0000 (20:27 +0000)]
Merge "test_vendor: Add HciPacket and Iterator classes" am:
3e1a3d0ddc am:
ff5beab4fd
am:
808c25199a
Change-Id: I639d24fb6a6b68f6280191495ca247ad7c978700
Pavlin Radoslavov [Fri, 4 Aug 2017 20:26:55 +0000 (20:26 +0000)]
Protect the btif config state with a lock during cleanup am:
a4febd6d04 am:
407754ba3a
am:
762e953d59
Change-Id: Icaa34698cb98f593e55519efd2072bf11f06c951
johnshamoon [Tue, 25 Jul 2017 16:50:04 +0000 (09:50 -0700)]
test_vendor: Add Iterator tests
Add Iterator tests to check that the overloaded operators and bounded iterators
are implemented correctly.
Test: Run the unit tests:
out/host/linux-x86/nativetest64/test-vendor_test_host/\
test-vendor_test_host --gtest_filter=IteratorTest.*
Change-Id: I6402cc36fe6818fa972524ac20aed526128a8553
johnshamoon [Fri, 4 Aug 2017 20:20:39 +0000 (20:20 +0000)]
Merge "test_vendor: Add HciPacket and Iterator classes" am:
3e1a3d0ddc
am:
ff5beab4fd
Change-Id: Ie44e518117764d92cb67d23a0b3d1a059e708540
Pavlin Radoslavov [Fri, 4 Aug 2017 20:20:24 +0000 (20:20 +0000)]
Protect the btif config state with a lock during cleanup am:
a4febd6d04
am:
407754ba3a
Change-Id: I8cb723ca43c3917faa690c191078e0575aa21625
johnshamoon [Fri, 4 Aug 2017 20:14:51 +0000 (20:14 +0000)]
Merge "test_vendor: Add HciPacket and Iterator classes"
am:
3e1a3d0ddc
Change-Id: Ide1490901c49ae9e38e69ba6315c69df92c7bb27
Pavlin Radoslavov [Fri, 4 Aug 2017 20:14:24 +0000 (20:14 +0000)]
Protect the btif config state with a lock during cleanup
am:
a4febd6d04
Change-Id: I47a3b5efc680954afc11e58f16c440284ba016a9
Treehugger Robot [Fri, 4 Aug 2017 20:13:17 +0000 (20:13 +0000)]
Merge "test_vendor: Add HciPacket and Iterator classes"
Pavlin Radoslavov [Fri, 4 Aug 2017 18:26:21 +0000 (11:26 -0700)]
Protect the btif config state with a lock during cleanup
Bug:
64186300
Test: Code compilation, enable/disable Bluetooth
Change-Id: Ic2397a128d59c9cc69cbd8252734b69eb7c02501
(cherry picked from commit
a4febd6d0460ee0f5834822ca406a4b8bab28cf1)
Pavlin Radoslavov [Fri, 4 Aug 2017 18:26:21 +0000 (11:26 -0700)]
Protect the btif config state with a lock during cleanup
Bug:
64186300
Test: Code compilation, enable/disable Bluetooth
Change-Id: Ic2397a128d59c9cc69cbd8252734b69eb7c02501
Jakub Pawlowski [Fri, 4 Aug 2017 18:07:14 +0000 (18:07 +0000)]
Advertisement parsing fix for zero padding am:
35a9ea352d am:
b3bf1285f4
am:
04e74ae1f5
Change-Id: Ic99b3dbc6be1463ddfa618564f665c24f1dd188a
Jakub Pawlowski [Fri, 4 Aug 2017 18:01:14 +0000 (18:01 +0000)]
Advertisement parsing fix for zero padding am:
35a9ea352d
am:
b3bf1285f4
Change-Id: Ica2250b89a1f72bf15bf16d1eaf159fe71049c44
Jakub Pawlowski [Fri, 4 Aug 2017 17:55:13 +0000 (17:55 +0000)]
Advertisement parsing fix for zero padding
am:
35a9ea352d
Change-Id: I59bf8524b2c95c5f8c7f4261166057078dd25b7c
Jakub Pawlowski [Fri, 4 Aug 2017 15:56:53 +0000 (08:56 -0700)]
Advertisement parsing fix for zero padding
When AD data is zero padded, and Scan Response is appended at end, data
becomes invalid. Instead, zero paddning must be removed first.
Test: AdvertiseDataParserTest.RemoveTrailingZeros
Bug:
38489707
Change-Id: I229ca3db6c92bc06bc1429e72412417010721063
Pavlin Radoslavov [Fri, 4 Aug 2017 06:14:32 +0000 (06:14 +0000)]
Added another entry to the INTEROP_2MBPS_LINK_ONLY interoperability database am:
427da91563 am:
b7471f0173
am:
e998b84e8c
Change-Id: Ie246041d26910c9547402836e20a845a1fb0b4c7
Pavlin Radoslavov [Fri, 4 Aug 2017 06:08:00 +0000 (06:08 +0000)]
Added another entry to the INTEROP_2MBPS_LINK_ONLY interoperability database am:
427da91563
am:
b7471f0173
Change-Id: I953492a7be219d4b15f9b7ae581af3bceb5f47ef
Pavlin Radoslavov [Fri, 4 Aug 2017 06:02:00 +0000 (06:02 +0000)]
Added another entry to the INTEROP_2MBPS_LINK_ONLY interoperability database
am:
427da91563
Change-Id: I7412713b0c0104309b8e5fcffa7df2fde1eaa7f2
Pavlin Radoslavov [Fri, 4 Aug 2017 04:01:19 +0000 (04:01 +0000)]
Merge "Added another entry to the INTEROP_2MBPS_LINK_ONLY interoperability database" into oc-dr1-dev
am:
1dc69f4180
Change-Id: I9704aeb9017d0cae455470879c404d05b4199b4b
Pavlin Radoslavov [Fri, 4 Aug 2017 03:50:45 +0000 (03:50 +0000)]
Merge "Added another entry to the INTEROP_2MBPS_LINK_ONLY interoperability database" into oc-dr1-dev
Pavlin Radoslavov [Fri, 4 Aug 2017 00:34:07 +0000 (17:34 -0700)]
Added another entry to the INTEROP_2MBPS_LINK_ONLY interoperability database
Bug:
64357126
Test: Audio streaming to the affected carkit
Change-Id: I160eb3775c77fe400798f038d2aae7dd7825aacb
(cherry picked from commit
a5f0a7717d129ca8164a0712e63f41cc4b60dd72)
Pavlin Radoslavov [Fri, 4 Aug 2017 00:34:07 +0000 (17:34 -0700)]
Added another entry to the INTEROP_2MBPS_LINK_ONLY interoperability database
Bug:
64357126
Test: Audio streaming to the affected carkit
Change-Id: I160eb3775c77fe400798f038d2aae7dd7825aacb
Pankaj Kanwar [Fri, 4 Aug 2017 00:00:42 +0000 (00:00 +0000)]
Merge "Revert "Allow collection of Bluetooth firmware dumps in bugreports (3/3)"" into oc-dr1-dev
am:
233a2b47b2
Change-Id: If4d5777b4835b0a7d5e26833debdd666075f5950
Pankaj Kanwar [Thu, 3 Aug 2017 23:52:09 +0000 (23:52 +0000)]
Merge "Revert "Allow collection of Bluetooth firmware dumps in bugreports (3/3)"" into oc-dr1-dev
johnshamoon [Wed, 19 Jul 2017 19:06:54 +0000 (12:06 -0700)]
test_vendor: Add HciPacket and Iterator classes
HciPacket is the abstract base class for all packet types.
Iterator is the custom iterator class that all packet types will use
to iterate through. The iterators in this class are bounded from
[start_of_packet, length_of_packet]. This prevents incrementing the iterator
passed the end sentinel.
Test: Passes all of the tests in test/iterator_test.cc
Change-Id: If9fec9ae32d9a23575ad3e9219b8249d164bc0d5
Pankaj Kanwar [Thu, 3 Aug 2017 20:41:44 +0000 (20:41 +0000)]
Revert "Allow collection of Bluetooth firmware dumps in bugreports (3/3)"
This reverts commit
0580dd639cb10fafb6953d8a724db030df5030db.
Change-Id: I37f9ba5a9ace655d1d12404926a158fb9a4001a7
Pavlin Radoslavov [Thu, 3 Aug 2017 10:55:42 +0000 (10:55 +0000)]
Don't reuse AVDTP internal state for different purposes am:
8da87bea5e am:
42544cb250
am:
f5465c5a81
Change-Id: Ie075a5abcece437a40b92b8684f2a352a97e9370
Pavlin Radoslavov [Thu, 3 Aug 2017 10:55:36 +0000 (10:55 +0000)]
Add A2DP_DumpCodecInfo() API am:
219b85f136 am:
ae550b31c2
am:
f3f19bb10d
Change-Id: I1136a8cb666a00ca31747440a2235963953fce54
Pavlin Radoslavov [Thu, 3 Aug 2017 10:45:44 +0000 (10:45 +0000)]
Don't reuse AVDTP internal state for different purposes am:
8da87bea5e
am:
42544cb250
Change-Id: I5245bb4d02d11efbdd1bc06fbaf0ef865a9a9a94
Pavlin Radoslavov [Thu, 3 Aug 2017 10:45:40 +0000 (10:45 +0000)]
Add A2DP_DumpCodecInfo() API am:
219b85f136
am:
ae550b31c2
Change-Id: I711e1ceac6c0c44d34f9e5e8b0d2508a8e6af6f5
Pavlin Radoslavov [Thu, 3 Aug 2017 10:40:13 +0000 (10:40 +0000)]
Don't reuse AVDTP internal state for different purposes
am:
8da87bea5e
Change-Id: I1b35a8e6ba0f3d109731a1128c4ccb6363a9404c
Pavlin Radoslavov [Thu, 3 Aug 2017 10:40:09 +0000 (10:40 +0000)]
Add A2DP_DumpCodecInfo() API
am:
219b85f136
Change-Id: I1bc85fcf214ab75e130954245d585e3015b08bec
Pavlin Radoslavov [Wed, 2 Aug 2017 20:52:14 +0000 (13:52 -0700)]
Don't reuse AVDTP internal state for different purposes
A number of issues were exposed by carkits that proactively try
to discover the codecs supported by the Phone and explicitly select
the A2DP codec.
* Don't reuse p_scb->p_cap for storing the most recent fetched capability
and for storing the result configuration while reconfiguring the stream.
Instead, use p_scb->cfg for storing the result configuration.
* Don't try to reconfigure the audio stream before all peer's capabilities
have been retrieved.
* Don't reset p_scb->sep_info_idx after fetching all capabilities inside
bta_av_save_caps(), otherwise the stream reconfiguration logic is
confused. Apparently, p_scb->sep_info_idx is overused for both:
(a) Pointing where to store the next capability while fetching the
capabilities.
(b) Storing the selected the SEP after the codec selection is completed.
Resetting p_scb->sep_info_idx to 0 creates logical confusion when the
actual selected SEP index is 0.
* Add extra debug log messages
Test: Connecting to and streaming with various carkits
Bug:
64128712
Change-Id: I5f57e9069d5402bcbb17613470ac0d29c8e45069
(cherry picked from commit
c64dc1d28496b5e917d0f82317d40d3c60e6495d)
Pavlin Radoslavov [Wed, 2 Aug 2017 20:43:44 +0000 (13:43 -0700)]
Add A2DP_DumpCodecInfo() API
The API can be used to display A2DP codec info when using |LOG_DEBUG|.
Test: Code compilation
Bug:
64128712
Change-Id: I04379b45f24adb7008365d38ccc8aa7f49ed4b73
(cherry picked from commit
81c2234305d4c84eb38f0d5a92605e3b42366f84)
Pavlin Radoslavov [Thu, 3 Aug 2017 03:17:38 +0000 (03:17 +0000)]
Don't reuse AVDTP internal state for different purposes
am:
c64dc1d284
Change-Id: Id2640ae54ffe2da7cb5a5fc0275a1df8853d7045
Pavlin Radoslavov [Thu, 3 Aug 2017 02:47:37 +0000 (02:47 +0000)]
Add A2DP_DumpCodecInfo() API
am:
81c2234305
Change-Id: Ia7166677a094f498667a3508ce45d979830d32f4
Pavlin Radoslavov [Wed, 2 Aug 2017 20:52:14 +0000 (13:52 -0700)]
Don't reuse AVDTP internal state for different purposes
A number of issues were exposed by carkits that proactively try
to discover the codecs supported by the Phone and explicitly select
the A2DP codec.
* Don't reuse p_scb->p_cap for storing the most recent fetched capability
and for storing the result configuration while reconfiguring the stream.
Instead, use p_scb->cfg for storing the result configuration.
* Don't try to reconfigure the audio stream before all peer's capabilities
have been retrieved.
* Don't reset p_scb->sep_info_idx after fetching all capabilities inside
bta_av_save_caps(), otherwise the stream reconfiguration logic is
confused. Apparently, p_scb->sep_info_idx is overused for both:
(a) Pointing where to store the next capability while fetching the
capabilities.
(b) Storing the selected the SEP after the codec selection is completed.
Resetting p_scb->sep_info_idx to 0 creates logical confusion when the
actual selected SEP index is 0.
* Add extra debug log messages
Test: Connecting to and streaming with various carkits
Bug:
64128712
Change-Id: I5f57e9069d5402bcbb17613470ac0d29c8e45069
Pavlin Radoslavov [Wed, 2 Aug 2017 20:43:44 +0000 (13:43 -0700)]
Add A2DP_DumpCodecInfo() API
The API can be used to display A2DP codec info when using |LOG_DEBUG|.
Test: Code compilation
Bug:
64128712
Change-Id: I04379b45f24adb7008365d38ccc8aa7f49ed4b73
Jakub Pawlowski [Wed, 2 Aug 2017 22:12:20 +0000 (22:12 +0000)]
Workaround for Traxxas am:
02d1ec171f am:
9f4e534074
am:
7571a640eb
Change-Id: Ie8b9c333c21c4e7b74a432238a7e57aa6be227ba
Jakub Pawlowski [Wed, 2 Aug 2017 22:07:20 +0000 (22:07 +0000)]
Workaround for Traxxas am:
02d1ec171f
am:
9f4e534074
Change-Id: I34c64ec33c5cb09d839416f81110b3594e125bb4
Jakub Pawlowski [Wed, 2 Aug 2017 22:02:51 +0000 (22:02 +0000)]
Workaround for Traxxas
am:
02d1ec171f
Change-Id: If547b412aabc0cf86194116c9a0641e700209336
Jakub Pawlowski [Tue, 1 Aug 2017 22:12:04 +0000 (15:12 -0700)]
Workaround for Traxxas
Bug:
64252588
Test: net_test_stack_ad_parser
Change-Id: I1471e9e5f0f36ec931f8d86c927abbc1137e2b94
Sunny Kapdi [Wed, 2 Aug 2017 19:56:32 +0000 (19:56 +0000)]
Merge "AE: Set secondary adv max skip to zero" into oc-dr1-dev
am:
427ea2398a
Change-Id: I7fddeb8c364d2253c8d8916458148ee6a5dbd09f
Joseph Pirozzo [Wed, 2 Aug 2017 19:56:12 +0000 (19:56 +0000)]
Merge "AVRCP Controller request metadata on playback." am:
39b6c45264 am:
9cc7daf831
am:
d1fd1f38c9
Change-Id: Ie8331109bfb153f3ef9c98b4a72a0ffaa8807abc
Joseph Pirozzo [Wed, 2 Aug 2017 19:51:39 +0000 (19:51 +0000)]
Merge "AVRCP Controller request metadata on playback." am:
39b6c45264
am:
9cc7daf831
Change-Id: Ie860ca5d4c8b2330f77279ec0eba84496da48f54
Joseph Pirozzo [Wed, 2 Aug 2017 19:47:11 +0000 (19:47 +0000)]
Merge "AVRCP Controller request metadata on playback."
am:
39b6c45264
Change-Id: Ia5000440315c0f8a1bc75142e4463606e9fc931c
Joseph Pirozzo [Wed, 2 Aug 2017 19:33:05 +0000 (19:33 +0000)]
Merge "AVRCP Controller request metadata on playback."
TreeHugger Robot [Wed, 2 Aug 2017 19:27:48 +0000 (19:27 +0000)]
Merge "AE: Set secondary adv max skip to zero" into oc-dr1-dev
Sunny Kapdi [Wed, 2 Aug 2017 17:24:01 +0000 (17:24 +0000)]
Merge "AE: Set secondary adv max skip to zero" am:
b92d9f3530 am:
149053fe3d
am:
483293d6e7
Change-Id: Iff3604eb976a06f22f54e91d90783cf77274c013
Sunny Kapdi [Wed, 2 Aug 2017 17:19:19 +0000 (17:19 +0000)]
Merge "AE: Set secondary adv max skip to zero" am:
b92d9f3530
am:
149053fe3d
Change-Id: Ie7f516abf4a778b4e288ef5ab069b9a64fa0ca50
Sunny Kapdi [Wed, 2 Aug 2017 17:13:59 +0000 (17:13 +0000)]
Merge "AE: Set secondary adv max skip to zero"
am:
b92d9f3530
Change-Id: I54710829a6ba81d69bbee4571c00492d4a612e32
Treehugger Robot [Wed, 2 Aug 2017 17:08:20 +0000 (17:08 +0000)]
Merge "AE: Set secondary adv max skip to zero"
Sunny Kapdi [Tue, 13 Jun 2017 19:20:04 +0000 (12:20 -0700)]
AE: Set secondary adv max skip to zero
Setting secondary adv max skip to zero to guarantee
when the AUX Tx happens. This way the App can use the
primary advertising interval to dictate the AUX Tx
interval.
Bug:
62552121
Change-Id: Id66222e4f8a583c42acafb6532f81a817504e606
Joseph Pirozzo [Tue, 1 Aug 2017 21:58:03 +0000 (14:58 -0700)]
AVRCP Controller request metadata on playback.
Track metadata is only provided when requested, and the current
implementation only requested it when there was a track change
notification. Add a request for metadata whenever there is an
update to indicate that the play status is playing.
Bug:
63998350
Test: Start playing media, make a phone call, end a phonecall observe
metadata is correct.
Change-Id: Iea5cdacfe95c1a98cdaf73836ee6359a923f481b
jruthe [Wed, 2 Aug 2017 02:23:07 +0000 (02:23 +0000)]
test_vendor: Rename discoverable devices. am:
974b1f9a91 am:
6e928fcdd7
am:
05c66c947e
Change-Id: I627213c146569a20ae9635e64c6debb40dc3c0c8
jruthe [Wed, 2 Aug 2017 02:18:36 +0000 (02:18 +0000)]
test_vendor: Rename discoverable devices. am:
974b1f9a91
am:
6e928fcdd7
Change-Id: I483622c7d27b5acb12d8040199f96496cdad998f
jruthe [Wed, 2 Aug 2017 02:14:34 +0000 (02:14 +0000)]
test_vendor: Rename discoverable devices.
am:
974b1f9a91
Change-Id: I2252dd34fa376c4aa3e6da49b0f5f75f59d05837
jruthe [Tue, 1 Aug 2017 23:44:15 +0000 (16:44 -0700)]
test_vendor: Rename discoverable devices.
Test: compiles
Change-Id: I1fc1f6845995e9e816556679622db6f6d447b7b3
Sunny Kapdi [Tue, 13 Jun 2017 19:20:04 +0000 (12:20 -0700)]
AE: Set secondary adv max skip to zero
Setting secondary adv max skip to zero to guarantee
when the AUX Tx happens. This way the App can use the
primary advertising interval to dictate the AUX Tx
interval.
Bug:
62552121
Change-Id: Id66222e4f8a583c42acafb6532f81a817504e606
Satish Kodishala [Tue, 1 Aug 2017 08:04:51 +0000 (08:04 +0000)]
Merge "Use the correct AVDTP version-specific features" into oc-dr1-dev
am:
3568ed17b5
Change-Id: I224d44cf863d63bf06790eacb640849000326106
TreeHugger Robot [Tue, 1 Aug 2017 07:59:36 +0000 (07:59 +0000)]
Merge "Use the correct AVDTP version-specific features" into oc-dr1-dev
Subramanian Srinivasan [Tue, 1 Aug 2017 06:17:16 +0000 (06:17 +0000)]
Merge "Fix processing of Inquiry results data" into oc-dr1-dev
am:
60a5b95359
Change-Id: I09bea5fc3de0ed2e28c68d22cdf6c5d1d12a73a2
Subramanian Srinivasan [Tue, 1 Aug 2017 06:13:57 +0000 (06:13 +0000)]
Merge "Fix processing of Inquiry results data" am:
67da9a5e19 am:
6718f5d924
am:
39c7208fe8
Change-Id: I92c848148fd148406d8a1d8db937f7432b2bb1bd
OSDN Git Service
