OSDN Git Service
Jakub Pawlowski [Mon, 27 Mar 2017 21:32:59 +0000 (21:32 +0000)]
Merge "Bluetooth GATT callback naming fix "Ext" -> "" (2/2)" am:
0d76e0b3c1 am:
2d30263860
am:
a10df55a65
Change-Id: I1d47dc2975b1408daa2f30435f2db24257ad2c97
Jakub Pawlowski [Mon, 27 Mar 2017 21:27:29 +0000 (21:27 +0000)]
Merge "Bluetooth GATT callback naming fix "Ext" -> "" (2/2)" am:
0d76e0b3c1
am:
2d30263860
Change-Id: I6ad406ff1231cd52d7d764f1cd6c3eb1449b08f7
Jakub Pawlowski [Mon, 27 Mar 2017 21:21:19 +0000 (21:21 +0000)]
Merge "Bluetooth GATT callback naming fix "Ext" -> "" (2/2)"
am:
0d76e0b3c1
Change-Id: I37d5414b3dc58b7eb10cbf2523578fd6044b3ad7
Jakub Pawlowski [Mon, 27 Mar 2017 21:15:20 +0000 (21:15 +0000)]
Merge "Bluetooth GATT callback naming fix "Ext" -> "" (2/2)"
Jakub Pawlowski [Mon, 27 Mar 2017 20:54:15 +0000 (20:54 +0000)]
Merge "Add option to specify initial LE connection PHY (3/3)" am:
8ef68115ff am:
0327911138
am:
0d63782a13
Change-Id: Iece2baeb669c514779230be001b03cc18dd8c097
Jakub Pawlowski [Mon, 27 Mar 2017 20:51:15 +0000 (20:51 +0000)]
Merge "Add option to specify initial LE connection PHY (3/3)" am:
8ef68115ff
am:
0327911138
Change-Id: Ibea2ead2a71f949983e70679001ada2e63938e85
Jakub Pawlowski [Mon, 27 Mar 2017 20:48:15 +0000 (20:48 +0000)]
Merge "Add option to specify initial LE connection PHY (3/3)"
am:
8ef68115ff
Change-Id: I6823a2ce47ed40fd377c5400026ae36dd63ebf4c
Jakub Pawlowski [Mon, 27 Mar 2017 19:20:56 +0000 (12:20 -0700)]
Bluetooth GATT callback naming fix "Ext" -> "" (2/2)
Gatt callback don't need the "Ext" postfix, as it was removed from new
API.
Test: manual
Bug:
30622771
Change-Id: Ie7f764062662277b8c82b9a9e4628ce9411a924f
Jakub Pawlowski [Mon, 27 Mar 2017 20:43:53 +0000 (20:43 +0000)]
Merge "Add option to specify initial LE connection PHY (3/3)"
Jakub Pawlowski [Sat, 25 Mar 2017 00:56:09 +0000 (17:56 -0700)]
Add option to specify initial LE connection PHY (3/3)
For whitelist connections we always use all possible PHYs, for direct
connection use PHY specified by client.
Test: manual
Bug:
30622771
Change-Id: I6e4de425ab3f367eb6c00ce36dee1d59869c0061
Jakub Pawlowski [Mon, 27 Mar 2017 18:14:26 +0000 (18:14 +0000)]
Merge "Fix (again) bad scan record data length" am:
02634fce73 am:
4361ddf27e
am:
23dc8bb47f
Change-Id: I485d752aa5939212279481287ca78b0d73b15a42
Jakub Pawlowski [Mon, 27 Mar 2017 18:11:27 +0000 (18:11 +0000)]
Merge "Fix (again) bad scan record data length" am:
02634fce73
am:
4361ddf27e
Change-Id: I5e97a6e3c9475c7aacfc7da19e4c725cf4bcf1dd
Jakub Pawlowski [Mon, 27 Mar 2017 18:08:27 +0000 (18:08 +0000)]
Merge "Fix (again) bad scan record data length"
am:
02634fce73
Change-Id: I0b76cc39e4832cc6fed278a39ee03780be2de887
Treehugger Robot [Mon, 27 Mar 2017 18:03:39 +0000 (18:03 +0000)]
Merge "Fix (again) bad scan record data length"
Jakub Pawlowski [Sat, 25 Mar 2017 19:49:42 +0000 (12:49 -0700)]
Fix (again) bad scan record data length
Bug:
36530831
Test: sl4a Bt5ScanTest:test_legacy_scan_result_raw_length
Change-Id: Ie7b04c40947f6419a665a8f6c1244effa63d8a7e
Jakub Pawlowski [Fri, 24 Mar 2017 20:47:08 +0000 (20:47 +0000)]
Merge "Expose connection update callback (3/4)" am:
ffca06958c am:
7b12bc9c49
am:
e1c53baafb
Change-Id: I52413e8cf101ff2220c81dc279ed23fe6614ec8e
Jakub Pawlowski [Fri, 24 Mar 2017 20:41:59 +0000 (20:41 +0000)]
Merge "Expose connection update callback (3/4)" am:
ffca06958c
am:
7b12bc9c49
Change-Id: I71ca7c100bdd84567be1d571f6a0a907d8f3d715
Jakub Pawlowski [Fri, 24 Mar 2017 20:36:37 +0000 (20:36 +0000)]
Merge "Expose connection update callback (3/4)"
am:
ffca06958c
Change-Id: I53e75df168f3f907bd0849913cad6b4565520384
Jakub Pawlowski [Fri, 24 Mar 2017 20:31:31 +0000 (20:31 +0000)]
Merge "Expose connection update callback (3/4)"
Jakub Pawlowski [Fri, 24 Mar 2017 01:13:33 +0000 (18:13 -0700)]
Expose connection update callback (3/4)
Test: manual
Bug:
30622771
Change-Id: Ie731cf45bbb0ef01c5c6c13d149d75fea82e38d8
Jakub Pawlowski [Fri, 24 Mar 2017 01:16:55 +0000 (01:16 +0000)]
Merge "Set preferred PHY and read PHY implementation (1/3)" am:
d84a18a54e am:
a54ea98fcc
am:
4e4ff25e90
Change-Id: I87445175c2e418badf89844834db725f802698fc
Jakub Pawlowski [Fri, 24 Mar 2017 01:14:55 +0000 (01:14 +0000)]
Merge "Set preferred PHY and read PHY implementation (1/3)" am:
d84a18a54e
am:
a54ea98fcc
Change-Id: I7254cf7ea5a07b1084035ebfae64a030fde160ed
Jakub Pawlowski [Fri, 24 Mar 2017 01:12:54 +0000 (01:12 +0000)]
Merge "Set preferred PHY and read PHY implementation (1/3)"
am:
d84a18a54e
Change-Id: I2a785efa6a06e8b694a58d01670d60cfde69c781
Jakub Pawlowski [Fri, 24 Mar 2017 01:08:07 +0000 (01:08 +0000)]
Merge "Set preferred PHY and read PHY implementation (1/3)"
Jakub Pawlowski [Thu, 23 Mar 2017 02:06:09 +0000 (19:06 -0700)]
Set preferred PHY and read PHY implementation (1/3)
Test: manual
Bug:
30622771
Change-Id: I43b7b036e50188f76d8ed0609f5142b2a4ad07ee
Ajay Panicker [Thu, 23 Mar 2017 17:36:07 +0000 (17:36 +0000)]
Merge "Remove Context from mockContentResolver to avoid a Null Pointer Exception" am:
60a96344f5 am:
277ca2bae4
am:
84e4884c57
Change-Id: I74329956dbe0c7ce64093a2f7539f0f68ebc4f6c
Ajay Panicker [Thu, 23 Mar 2017 17:33:01 +0000 (17:33 +0000)]
Merge "Remove Context from mockContentResolver to avoid a Null Pointer Exception" am:
60a96344f5
am:
277ca2bae4
Change-Id: I14fc1d2b775eaf41de0a283d568a5a538a2e8b39
Ajay Panicker [Thu, 23 Mar 2017 17:30:01 +0000 (17:30 +0000)]
Merge "Remove Context from mockContentResolver to avoid a Null Pointer Exception"
am:
60a96344f5
Change-Id: I92ae10bb280126f566cb373b1672f39cf7267ed0
Treehugger Robot [Thu, 23 Mar 2017 17:27:35 +0000 (17:27 +0000)]
Merge "Remove Context from mockContentResolver to avoid a Null Pointer Exception"
Jakub Pawlowski [Thu, 23 Mar 2017 01:33:40 +0000 (01:33 +0000)]
Merge "Bluetooth 5 Enable->Enabled (2/2)" am:
f5505ac184 am:
fe39467aad
am:
a46f78b758
Change-Id: I7aefa97a6dfc01eb8a0ad26ecf7a82cbbf55725d
Jakub Pawlowski [Thu, 23 Mar 2017 01:29:30 +0000 (01:29 +0000)]
Merge "Bluetooth 5 Enable->Enabled (2/2)" am:
f5505ac184
am:
fe39467aad
Change-Id: I9622ce73ce78866609f7fa6ddf50f8bcaba9fc12
Jakub Pawlowski [Thu, 23 Mar 2017 01:25:36 +0000 (01:25 +0000)]
Merge "Bluetooth 5 Enable->Enabled (2/2)"
am:
f5505ac184
Change-Id: I4d102d76670253d72c719b1ca99457ea05a45e32
Jakub Pawlowski [Thu, 23 Mar 2017 01:17:42 +0000 (01:17 +0000)]
Merge "Bluetooth 5 Enable->Enabled (2/2)"
Ajay Panicker [Wed, 22 Mar 2017 23:29:56 +0000 (16:29 -0700)]
Remove Context from mockContentResolver to avoid a Null Pointer Exception
mockContentResolver was updated to call a function on the context provided
in its constructor which caused an exception with mockContext. Instead leaving
the context out of the constructor skips this function call and doesn't affect
the test.
Test: Run unit tests with "runtest bluetooth"
Change-Id: I7a597c5864943d3d53dcb551bf3d3bafb4beb5ed
Jakub Pawlowski [Wed, 22 Mar 2017 22:41:35 +0000 (15:41 -0700)]
Bluetooth 5 Enable->Enabled (2/2)
Test: manual
Bug:
30622771
Change-Id: Ifce2fc20fde2c55f26cb54012c9ee4eb44b1c91e
Ajay Panicker [Wed, 22 Mar 2017 18:35:50 +0000 (18:35 +0000)]
Merge "Add rejected calls to Incomming Call History" am:
048d5aaff9 am:
fce8d2a965
am:
d76888650e
Change-Id: I3d05e3afad1e3b838c9134261f1d930d9486ffb2
Ajay Panicker [Wed, 22 Mar 2017 18:33:20 +0000 (18:33 +0000)]
Merge "Add rejected calls to Incomming Call History" am:
048d5aaff9
am:
fce8d2a965
Change-Id: I9b660f75a40159c826c8567830ec3fdca7b91189
Ajay Panicker [Wed, 22 Mar 2017 18:31:40 +0000 (18:31 +0000)]
Merge "Add rejected calls to Incomming Call History"
am:
048d5aaff9
Change-Id: I3351863c632270fac223726a624ae0fe2d8e0bf7
Treehugger Robot [Wed, 22 Mar 2017 18:25:10 +0000 (18:25 +0000)]
Merge "Add rejected calls to Incomming Call History"
Hemant Gupta [Wed, 22 Mar 2017 17:40:46 +0000 (17:40 +0000)]
Merge "OPP: Remove un-supported formats from SDP" am:
65f0a7ea2c am:
a3014f0f18
am:
462b2a5ec5
Change-Id: I3df17257fcc3f0e896772b8c7a239c0cdaeddf22
Hemant Gupta [Wed, 22 Mar 2017 17:38:46 +0000 (17:38 +0000)]
Merge "OPP: Remove un-supported formats from SDP" am:
65f0a7ea2c
am:
a3014f0f18
Change-Id: Ia188c408e5cf436a85d33b4dac667f36b5003fcc
Hemant Gupta [Wed, 22 Mar 2017 17:37:11 +0000 (17:37 +0000)]
Merge "OPP: Remove un-supported formats from SDP"
am:
65f0a7ea2c
Change-Id: I8976455db62ecffc8df8b70eb8248191321c5c6d
Treehugger Robot [Wed, 22 Mar 2017 17:31:17 +0000 (17:31 +0000)]
Merge "OPP: Remove un-supported formats from SDP"
Ajay Panicker [Wed, 22 Mar 2017 01:22:04 +0000 (18:22 -0700)]
Add rejected calls to Incomming Call History
Bug:
36490575
Test: Connect to carkit after rejecting a call on test device
Change-Id: Ifa3593b5b26e13a3bd6d2b94f744254e3eb353fb
Hemant Gupta [Wed, 22 Mar 2017 16:01:10 +0000 (16:01 +0000)]
Merge "OPP: Replace deprecated API(s) with new API." am:
a2f7b90981 am:
3b6dac5898
am:
32af253a3f
Change-Id: Ice9ba86ccc496ac8c0f2e03b6891a31af035f497
Hemant Gupta [Wed, 22 Mar 2017 15:59:10 +0000 (15:59 +0000)]
Merge "OPP: Replace deprecated API(s) with new API." am:
a2f7b90981
am:
3b6dac5898
Change-Id: I568f8acbdc585d97385b39af4bb42df1d1b70c74
Hemant Gupta [Wed, 22 Mar 2017 15:56:40 +0000 (15:56 +0000)]
Merge "OPP: Replace deprecated API(s) with new API."
am:
a2f7b90981
Change-Id: Id018ab5d51c3f53f4fd208fbd82abf9b320cdbe5
Hemant Gupta [Tue, 21 Mar 2017 10:30:05 +0000 (16:00 +0530)]
OPP: Remove un-supported formats from SDP
Use case:
1. Send a vcalendar file to DUT
2. Verify file is received on DUT
Result:
DUT rejects vCalendar put request with reason unsupported media type
although DUT SDP records claim support for vcalendar format. Same is valid
for vNote and vMessage formats as well.
Rootcause:
ACCEPTABLE_SHARE_INBOUND_TYPES does not have support for above MIME formats.
Fix:
Remove vCal, vNote and vMessage from OPP Server supported format list.
Reproducibiltiy:
5/5
Test: All PTS tests that were enabled because of support for different OPP MIME
formats got disabled as by default OPP Rx will not support these MIME formats
leading to no OPP failures in PTS.
Bug:
36467777
Change-Id: I2503f5c61dd28fd3cf73d10939c6d931dbe0d6ea
Treehugger Robot [Wed, 22 Mar 2017 15:50:07 +0000 (15:50 +0000)]
Merge "OPP: Replace deprecated API(s) with new API."
Hemant Gupta [Mon, 6 Feb 2017 09:51:21 +0000 (15:21 +0530)]
OPP: Replace deprecated API(s) with new API.
Remove unnecessary variable/functions and avoid using
deprecated API(s).
Test: OPP functionality (Tx/Rx) works fine without issues.
Bug:
35013632
Change-Id: Ice9314d599d0c0f4d7cc0e1ed70c7e87fa41e937
Jack He [Wed, 22 Mar 2017 02:24:51 +0000 (02:24 +0000)]
Merge "Call System.exit(0) in onDestroy" am:
0214c82fd5 am:
30d0df8a3e
am:
219d962f1b
Change-Id: I9dbe6edba105476b2b4c423e019168c3d92948e4
Jack He [Wed, 22 Mar 2017 02:22:50 +0000 (02:22 +0000)]
Merge "Call System.exit(0) in onDestroy" am:
0214c82fd5
am:
30d0df8a3e
Change-Id: I7b2f6c7fc3e5657a4911421db57815e7fe5d0959
Jack He [Wed, 22 Mar 2017 02:20:55 +0000 (02:20 +0000)]
Merge "Call System.exit(0) in onDestroy"
am:
0214c82fd5
Change-Id: I6c742028f19ca69badf29ef2268e064fec1fd085
Treehugger Robot [Wed, 22 Mar 2017 02:18:05 +0000 (02:18 +0000)]
Merge "Call System.exit(0) in onDestroy"
Jack He [Tue, 21 Mar 2017 23:50:56 +0000 (16:50 -0700)]
Call System.exit(0) in onDestroy
Call System.exit(0) in onDestroy() to make sure state is cleared in
the Bluetooth stack when Bluetooth is disabled
Bug:
27859763
Bug:
36487153
Test: Build, run unit tests, Bluetooth enable/disable
Change-Id: I34917ca3302b01c4da74b969da08860d6fbf8274
Jakub Pawlowski [Tue, 21 Mar 2017 19:00:03 +0000 (19:00 +0000)]
Merge "Add setScannable to AdvertisingSetParameters (2/2)" am:
96bd28a78f am:
d17f248ff8
am:
6c6ed288ea
Change-Id: Ie7abafed19a71b35ae651dbbeb448a2823c9e814
Jakub Pawlowski [Tue, 21 Mar 2017 18:52:06 +0000 (18:52 +0000)]
Merge "Add setScannable to AdvertisingSetParameters (2/2)" am:
96bd28a78f
am:
d17f248ff8
Change-Id: I2d30b3d958efb2054633f9ff6e6a3469b8fe5fa6
Jakub Pawlowski [Tue, 21 Mar 2017 18:44:40 +0000 (18:44 +0000)]
Merge "Add setScannable to AdvertisingSetParameters (2/2)"
am:
96bd28a78f
Change-Id: Ifed8433505a93e4225219020b7e8428a015dbf2f
Jakub Pawlowski [Tue, 21 Mar 2017 18:37:34 +0000 (18:37 +0000)]
Merge "Add setScannable to AdvertisingSetParameters (2/2)"
Jakub Pawlowski [Mon, 20 Mar 2017 22:59:27 +0000 (15:59 -0700)]
Add setScannable to AdvertisingSetParameters (2/2)
There must be a proper way to specify if advertisment is scannable, when
updating the parameters.
Test: manual
Bug:
30622771
Change-Id: I9e5a8967a594ccb245acc30b6a9bf6ef2ff260d1
Jakub Pawlowski [Mon, 20 Mar 2017 22:41:15 +0000 (22:41 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (2/4)" am:
b9954db54b am:
b8a0a458e2
am:
8899aaeb8d
Change-Id: I5e1dce7724a8d27b1f80c23cf8cd3a8f1a6aa706
Jakub Pawlowski [Mon, 20 Mar 2017 22:33:17 +0000 (22:33 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (2/4)" am:
b9954db54b
am:
b8a0a458e2
Change-Id: I5dea47ad652c32f02b5ea40745db51f14cf2334c
Jakub Pawlowski [Mon, 20 Mar 2017 22:26:50 +0000 (22:26 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (2/4)"
am:
b9954db54b
Change-Id: I718747628310e4a9af5b580e0a9752c0194fbb28
Jakub Pawlowski [Mon, 20 Mar 2017 22:19:07 +0000 (22:19 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (2/4)"
Jakub Pawlowski [Fri, 17 Mar 2017 22:32:28 +0000 (15:32 -0700)]
Bluetooth 5 AdvertisingSet implementation (2/4)
Test: manual
Bug:
30622771
Change-Id: I69e1ce6be3b776f783d2b2d18aee63a494b8cfd1
Jakub Pawlowski [Fri, 17 Mar 2017 23:09:36 +0000 (23:09 +0000)]
Merge "Bluetooth 5 move timeout parameter (2/2)" am:
91aa86124b am:
0cff63044b
am:
26abda20bf
Change-Id: I9eeacd23ccd9155fc26fee45a897adbbda33b345
Jack He [Fri, 17 Mar 2017 23:09:17 +0000 (23:09 +0000)]
Merge "Fix formatting issue on Headset State Machine" am:
61345026a7 am:
d9251e30cd
am:
b9e15bbb64 -s ours
Change-Id: I450faebab66e915677a672b1b6b0b3541dd0167b
Jakub Pawlowski [Fri, 17 Mar 2017 22:41:02 +0000 (22:41 +0000)]
Merge "Bluetooth 5 move timeout parameter (2/2)" am:
91aa86124b
am:
0cff63044b
Change-Id: I6bb27124452d690574e1fe1215b3d65096189709
Jakub Pawlowski [Fri, 17 Mar 2017 22:34:29 +0000 (22:34 +0000)]
Merge "Bluetooth 5 move timeout parameter (2/2)"
am:
91aa86124b
Change-Id: I9cdefa60cc696cb727a24f0d3a29969deeffc860
Jakub Pawlowski [Fri, 17 Mar 2017 22:24:04 +0000 (22:24 +0000)]
Merge "Bluetooth 5 move timeout parameter (2/2)"
Jakub Pawlowski [Fri, 17 Mar 2017 18:23:38 +0000 (11:23 -0700)]
Bluetooth 5 move timeout parameter (2/2)
Timeout is not a parameter, it is a property of enabling the
advertising. Move it into more proper place.
Test: manual
Bug:
30622771
Change-Id: Ib688f183bf71fe429da6b9c3c8eb3591e9c6ec1d
Jack He [Fri, 17 Mar 2017 22:00:02 +0000 (22:00 +0000)]
Merge "Fix formatting issue on Headset State Machine" am:
61345026a7
am:
d9251e30cd
Change-Id: I2520608c3b1afe11b6ae30735b9008870d8c4912
Jack He [Fri, 17 Mar 2017 21:56:50 +0000 (21:56 +0000)]
Merge "Fix formatting issue on Headset State Machine"
am:
61345026a7
Change-Id: I7058f53b20e94b75042ae1127e0a3b6f099d50b9
Treehugger Robot [Fri, 17 Mar 2017 21:49:01 +0000 (21:49 +0000)]
Merge "Fix formatting issue on Headset State Machine"
Jack He [Thu, 9 Mar 2017 19:57:02 +0000 (11:57 -0800)]
Fix formatting issue on Headset State Machine
Test: build, no user visible effect
Merged-In: I482661d95ac6e30a6f55afa9970627e889907125
Change-Id: I482661d95ac6e30a6f55afa9970627e889907125
TreeHugger Robot [Fri, 17 Mar 2017 20:08:01 +0000 (20:08 +0000)]
Merge "Fix formatting issue on Headset State Machine" into nyc-mr2-dev-plus-aosp
am:
8761a575df
Change-Id: If794768e8e746989fc0c8c5d317c7c2bd1f732df
TreeHugger Robot [Fri, 17 Mar 2017 19:59:13 +0000 (19:59 +0000)]
Merge "Fix formatting issue on Headset State Machine" into nyc-mr2-dev-plus-aosp
TreeHugger Robot [Fri, 17 Mar 2017 19:08:11 +0000 (19:08 +0000)]
Merge "Fix formatting issue on Headset State Machine"
Jack He [Thu, 9 Mar 2017 19:57:02 +0000 (11:57 -0800)]
Fix formatting issue on Headset State Machine
Test: build, no user visible effect
Change-Id: I482661d95ac6e30a6f55afa9970627e889907125
(cherry picked from commit
79ea359530515b27f608e52cc53f33d3797f7d4c)
Jack He [Thu, 9 Mar 2017 19:57:02 +0000 (11:57 -0800)]
Fix formatting issue on Headset State Machine
Test: build, no user visible effect
Change-Id: I482661d95ac6e30a6f55afa9970627e889907125
(cherry picked from commit
79ea359530515b27f608e52cc53f33d3797f7d4c)
Andre Eisenbach [Fri, 17 Mar 2017 06:42:42 +0000 (06:42 +0000)]
Merge "Revert "jni: introduce ScopedBtAddr"" am:
e4406bcc36 am:
6762afd6e8
am:
99d6eda3b2
Change-Id: Ic5e1fdaffcafba03f8966f149a6ca165c6d8b22f
Andre Eisenbach [Fri, 17 Mar 2017 06:39:41 +0000 (06:39 +0000)]
Merge "Revert "jni: introduce ScopedBtAddr"" am:
e4406bcc36
am:
6762afd6e8
Change-Id: Ieb081a35769a29b391cd295aecc3de0b6ccd721f
Andre Eisenbach [Fri, 17 Mar 2017 06:36:11 +0000 (06:36 +0000)]
Merge "Revert "jni: introduce ScopedBtAddr""
am:
e4406bcc36
Change-Id: Ie136e2b870e7892bbfe8c62323c95f0578dca1e5
Andre Eisenbach [Fri, 17 Mar 2017 06:32:48 +0000 (06:32 +0000)]
Merge "Revert "jni: introduce ScopedBtAddr""
Andre Eisenbach [Fri, 17 Mar 2017 04:47:41 +0000 (04:47 +0000)]
Revert "jni: introduce ScopedBtAddr"
Causes crash on Fugu. Reverting for now until further investigation.
This reverts commit
2b233628767c0bf6ff21ae2acdeada8bea94e583.
Change-Id: I21daf6b75312695d7ccb83ae603aaeffc3c9e770
Jakub Pawlowski [Fri, 17 Mar 2017 05:31:15 +0000 (05:31 +0000)]
Merge "LE Maximum Advertising Data Length (2/4)" am:
4cee47de11 am:
9a6a474ca6
am:
d45acd0053
Change-Id: Ie13b1b78b9b21349f6490d5256ae5597f220cd62
Jakub Pawlowski [Fri, 17 Mar 2017 05:26:34 +0000 (05:26 +0000)]
Merge "LE Maximum Advertising Data Length (2/4)" am:
4cee47de11
am:
9a6a474ca6
Change-Id: I3d5b8bee005363993e377ea6164d4b79de965ee3
Jakub Pawlowski [Fri, 17 Mar 2017 05:20:06 +0000 (05:20 +0000)]
Merge "LE Maximum Advertising Data Length (2/4)"
am:
4cee47de11
Change-Id: I2a26d6eb8a9b8372dc2a171e798aec5f122794b0
Jakub Pawlowski [Fri, 17 Mar 2017 05:13:44 +0000 (05:13 +0000)]
Merge "LE Maximum Advertising Data Length (2/4)"
Marie Janssen [Fri, 17 Mar 2017 02:36:56 +0000 (02:36 +0000)]
Merge "jni: introduce ScopedBtAddr" am:
9b94cc9fe2 am:
f412949fc2
am:
6f8ec392c5
Change-Id: I4fc5b4f5eec1d34f01bcdd51fb10f2fb0dc0e699
Marie Janssen [Fri, 17 Mar 2017 02:33:55 +0000 (02:33 +0000)]
Merge "jni: introduce ScopedBtAddr" am:
9b94cc9fe2
am:
f412949fc2
Change-Id: Ie7b35b98973e13dbe2d5d3f6ff29c52f6e724ff0
Marie Janssen [Fri, 17 Mar 2017 02:31:25 +0000 (02:31 +0000)]
Merge "jni: introduce ScopedBtAddr"
am:
9b94cc9fe2
Change-Id: I53de9a0f7d17118088206ddd18aa706aa44de7fc
Treehugger Robot [Fri, 17 Mar 2017 02:26:53 +0000 (02:26 +0000)]
Merge "jni: introduce ScopedBtAddr"
Jakub Pawlowski [Fri, 17 Mar 2017 01:21:31 +0000 (18:21 -0700)]
LE Maximum Advertising Data Length (2/4)
Add ability to check maximum advertising data length.
Bug:
30622771
Test: manual
Change-Id: Ia912f9d738ec8dbf56205a1c22a21f687d9cb6cd
Jakub Pawlowski [Fri, 17 Mar 2017 01:21:47 +0000 (01:21 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (2/4)" am:
92b2f24308 am:
b0cefb9617
am:
a1c00d1c01
Change-Id: I021d704fb92c155a5520a39a8d174dbb897d3982
Jakub Pawlowski [Fri, 17 Mar 2017 01:15:14 +0000 (01:15 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (2/4)" am:
92b2f24308
am:
b0cefb9617
Change-Id: I45899e32959c4295400e1715355c93db747d9674
Jakub Pawlowski [Fri, 17 Mar 2017 01:09:08 +0000 (01:09 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (2/4)"
am:
92b2f24308
Change-Id: I5d070edb82d2b1d51339bb68e9dc1fdb46e035e0
Treehugger Robot [Fri, 17 Mar 2017 01:01:15 +0000 (01:01 +0000)]
Merge "Bluetooth 5 AdvertisingSet implementation (2/4)"
Marie Janssen [Wed, 15 Feb 2017 20:49:52 +0000 (12:49 -0800)]
jni: introduce ScopedBtAddr
ScopedBtAddr handles marshalling bt_bdaddr_t into jbyteArrays so we
don't have to. It also complains when it can't allocate things and
deletes the local reference when it goes out of scope.
Test: compiles, sanity tests with various profiles
Change-Id: I78a6364cc5cac0e8664d2d04388a6e2ac4c7a58f
Jakub Pawlowski [Mon, 13 Mar 2017 18:14:27 +0000 (11:14 -0700)]
Bluetooth 5 AdvertisingSet implementation (2/4)
This patch wires up fist methods of AdvertisingSet, making it possible
to start advertising and stop advertising. It also replaces legacy
implemementation with calls to new implementation.
Bug:
30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: I35e7db5df1945d101402299f78dd541e346d548c
OSDN Git Service
