OSDN Git Service

(root) / android-x86 / system-bt.git / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
android-x86/system-bt.git
6 years ago[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 1bbea25a24 am: 44f3e1...
commit | commitdiff | tree
Android Build Merger (Role) [Thu, 12 Apr 2018 23:01:57 +0000 (23:01 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 1bbea25a24 am: 44f3e1f626 am: 8a8b10746b am: 943480ce6f skipped: 205eb14edd

Change-Id: I5d67820761fe4200e2a6e380c54250760bad1918

6 years ago[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 1bbea25a24 am: 44f3e1...
commit | commitdiff | tree
Android Build Merger (Role) [Thu, 12 Apr 2018 23:01:55 +0000 (23:01 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 1bbea25a24 am: 44f3e1f626 am: 8a8b10746b am: 943480ce6f

Change-Id: Ie319e5609bd4f8632ae12962fa04e0b19351b2cb

6 years ago[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 1bbea25a24 am: 44f3e1...
commit | commitdiff | tree
Android Build Merger (Role) [Thu, 12 Apr 2018 23:01:54 +0000 (23:01 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 1bbea25a24 am: 44f3e1f626 am: 8a8b10746b

Change-Id: Ib9b2c3f4ccf57ac6f98ef92c7e4697ddc5e3a8c2

6 years ago[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 1bbea25a24 am: 44f3e1f626
commit | commitdiff | tree
Android Build Merger (Role) [Thu, 12 Apr 2018 23:01:52 +0000 (23:01 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 1bbea25a24 am: 44f3e1f626

Change-Id: Iaf99e15b6a9b10cc463fe924ae38962ba52bbe9c

6 years ago[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 1bbea25a24
commit | commitdiff | tree
Android Build Merger (Role) [Thu, 12 Apr 2018 23:01:50 +0000 (23:01 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 1bbea25a24

Change-Id: I27a10e02807359d9fe4042098c99b2a1af2c015e

6 years agoDO NOT MERGE Fix OOB read in process_l2cap_cmd
commit | commitdiff | tree
Hansong Zhang [Thu, 12 Apr 2018 23:01:19 +0000 (16:01 -0700)]
DO NOT MERGE Fix OOB read in process_l2cap_cmd

Bug: 74202041
Bug: 74196706
Bug: 74201143
Test: manual
Change-Id: Ic25f7f3777d0375f76cc91e4d129b1636f1c388d

6 years agoMerge "PAN: Always allocate in bta_pan_data_buf_ind_cback" into oc-dev
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 21:06:56 +0000 (21:06 +0000)]
Merge "PAN: Always allocate in bta_pan_data_buf_ind_cback" into oc-dev

6 years agoMerge changes from topic "am-c847555c-4096-4a49-be7e-49a3a9c0417a" into nyc-mr2-dev
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-c847555c-4096-4a49-be7e-49a3a9c0417a" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8 am: 73cc697204 am: f1d2dd756e am: e8017c52aa am: e68784be2b
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8 am: 73cc697204 am: f1d2dd756e am: e8017c52aa
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8 am: 73cc697204 am: f1d2dd756e
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8 am: 73cc697204
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48
  DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback

6 years agoMerge changes from topic "am-c847555c-4096-4a49-be7e-49a3a9c0417a" into cw-f-dev
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-c847555c-4096-4a49-be7e-49a3a9c0417a" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8 am: 73cc697204 am: f1d2dd756e am: e8017c52aa
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8 am: 73cc697204 am: f1d2dd756e
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8 am: 73cc697204
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48
  DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback

6 years agoMerge changes from topic "am-c847555c-4096-4a49-be7e-49a3a9c0417a" into nyc-mr1-dev
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-c847555c-4096-4a49-be7e-49a3a9c0417a" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8 am: 73cc697204 am: f1d2dd756e
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8 am: 73cc697204
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48
  DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback

6 years agoMerge changes from topic "am-c847555c-4096-4a49-be7e-49a3a9c0417a" into nyc-dr1-dev
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-c847555c-4096-4a49-be7e-49a3a9c0417a" into nyc-dr1-dev

* changes:
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8 am: 73cc697204
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48
  DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback

6 years agoMerge changes from topic "am-c847555c-4096-4a49-be7e-49a3a9c0417a" into nyc-dev
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-c847555c-4096-4a49-be7e-49a3a9c0417a" into nyc-dev

* changes:
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48
  DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback

6 years agoMerge changes from topic "am-c847555c-4096-4a49-be7e-49a3a9c0417a" into oc-dev
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-c847555c-4096-4a49-be7e-49a3a9c0417a" into oc-dev

* changes:
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8 am: 73cc697204 am: f1d2dd756e am: e8017c52aa am: e68784be2b skipped: a8ea3b27b4
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8 am: 73cc697204 am: f1d2dd756e am: e8017c52aa am: e68784be2b
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8 am: 73cc697204 am: f1d2dd756e am: e8017c52aa
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8 am: 73cc697204 am: f1d2dd756e
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8 am: 73cc697204
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48
  DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback

6 years agoMerge changes from topic "am-86018ff8-723c-4999-a292-3b3936b26850" into nyc-mr2-dev
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 20:04:54 +0000 (20:04 +0000)]
Merge changes from topic "am-86018ff8-723c-4999-a292-3b3936b26850" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: e04c8be75d am: e2a17a082f am: ecb0bd81a9 am: dfbfd5cb0a
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: e04c8be75d am: e2a17a082f am: ecb0bd81a9
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: e04c8be75d am: e2a17a082f
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: e04c8be75d
  DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback

6 years agoMerge changes from topic "am-86018ff8-723c-4999-a292-3b3936b26850" into cw-f-dev
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 20:04:54 +0000 (20:04 +0000)]
Merge changes from topic "am-86018ff8-723c-4999-a292-3b3936b26850" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: e04c8be75d am: e2a17a082f am: ecb0bd81a9
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: e04c8be75d am: e2a17a082f
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: e04c8be75d
  DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback

6 years agoMerge changes from topic "am-86018ff8-723c-4999-a292-3b3936b26850" into nyc-mr1-dev
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 20:04:54 +0000 (20:04 +0000)]
Merge changes from topic "am-86018ff8-723c-4999-a292-3b3936b26850" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: e04c8be75d am: e2a17a082f
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: e04c8be75d
  DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback

6 years agoMerge changes from topic "am-86018ff8-723c-4999-a292-3b3936b26850" into nyc-dr1-dev
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 20:04:54 +0000 (20:04 +0000)]
Merge changes from topic "am-86018ff8-723c-4999-a292-3b3936b26850" into nyc-dr1-dev

* changes:
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: e04c8be75d
  DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback

6 years agoMerge "DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback" into nyc-dev
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 20:04:54 +0000 (20:04 +0000)]
Merge "DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback" into nyc-dev

6 years agoMerge changes from topic "am-86018ff8-723c-4999-a292-3b3936b26850" into oc-dev
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 20:04:54 +0000 (20:04 +0000)]
Merge changes from topic "am-86018ff8-723c-4999-a292-3b3936b26850" into oc-dev

* changes:
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: e04c8be75d am: e2a17a082f am: ecb0bd81a9 am: dfbfd5cb0a skipped: b5577b5144
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: e04c8be75d am: e2a17a082f am: ecb0bd81a9 am: dfbfd5cb0a
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: e04c8be75d am: e2a17a082f am: ecb0bd81a9
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: e04c8be75d am: e2a17a082f
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: e04c8be75d
  DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback

6 years agoPAN: Always allocate in bta_pan_data_buf_ind_cback
commit | commitdiff | tree
Myles Watson [Wed, 21 Mar 2018 23:45:32 +0000 (16:45 -0700)]
PAN: Always allocate in bta_pan_data_buf_ind_cback

Change I63b857d031c55d3a0754e4101e330843eb422b2a caused a double
free.  Move the free call to pan_data_buf_ind_cb().

Free the buffer before every return in pan_data_buf_ind_cb.

Bug: 74950468
Test: manual tethering test with DUT sharing its connection
Change-Id: If4526f3042699581e2cdde79a362eef0f83768eb
Merged-In: If4526f3042699581e2cdde79a362eef0f83768eb

6 years agoDO NOT MERGE Handle bad packet length in gatts_process_read_req
commit | commitdiff | tree
Stanley Tng [Thu, 5 Apr 2018 16:54:13 +0000 (09:54 -0700)]
DO NOT MERGE Handle bad packet length in gatts_process_read_req

Added error check and handling code in gatts_process_read_req to
make sure that the packet length is correct.
Please note that there is another earlier CL that is reverted and this
is the updated one.

Bug: 73172115
Test: Run the test program, poc, that was attached in the bug report
Merged-In: Ia9b4e502fa8f8384bf9767e68f73b48a0915141b
Change-Id: Ia9b4e502fa8f8384bf9767e68f73b48a0915141b
(cherry picked from commit cc9c7330d1c3507d745170ae7b2e0546197b7acb)

6 years agoMerge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into nyc...
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647 am: 2040db3cf0 am: 4d69ee4e17 am: 39da18a12c am: 20e297a2ba
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647 am: 2040db3cf0 am: 4d69ee4e17 am: 39da18a12c
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647 am: 2040db3cf0 am: 4d69ee4e17
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647 am: 2040db3cf0
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39
  DO NOT MERGE Handle bad packet length in gatts_process_read_req

6 years agoMerge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into cw...
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647 am: 2040db3cf0 am: 4d69ee4e17 am: 39da18a12c
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647 am: 2040db3cf0 am: 4d69ee4e17
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647 am: 2040db3cf0
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39
  DO NOT MERGE Handle bad packet length in gatts_process_read_req

6 years agoMerge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into nyc...
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647 am: 2040db3cf0 am: 4d69ee4e17
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647 am: 2040db3cf0
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39
  DO NOT MERGE Handle bad packet length in gatts_process_read_req

6 years agoMerge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into nyc...
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into nyc-dr1-dev

* changes:
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647 am: 2040db3cf0
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39
  DO NOT MERGE Handle bad packet length in gatts_process_read_req

6 years agoMerge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into nyc-dev
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into nyc-dev

* changes:
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39
  DO NOT MERGE Handle bad packet length in gatts_process_read_req

6 years agoMerge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into oc-dev
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into oc-dev

* changes:
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647 am: 2040db3cf0 am: 4d69ee4e17 am: 39da18a12c am: 20e297a2ba skipped: 45591ce16e
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647 am: 2040db3cf0 am: 4d69ee4e17 am: 39da18a12c am: 20e297a2ba
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647 am: 2040db3cf0 am: 4d69ee4e17 am: 39da18a12c
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647 am: 2040db3cf0 am: 4d69ee4e17
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647 am: 2040db3cf0
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39
  DO NOT MERGE Handle bad packet length in gatts_process_read_req

6 years agoMerge changes from topic "nyc-dev-check-pkt-when-processing-gatt-reads" into nyc...
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 15:19:58 +0000 (15:19 +0000)]
Merge changes from topic "nyc-dev-check-pkt-when-processing-gatt-reads" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: 810e669d7a am: d618664a5f am: 775e7073a4 am: c39fc2ed94
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: 810e669d7a am: d618664a5f am: 775e7073a4
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: 810e669d7a am: d618664a5f
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: 810e669d7a
  DO NOT MERGE Handle bad packet length in gatts_process_read_req

6 years agoMerge changes from topic "nyc-dev-check-pkt-when-processing-gatt-reads" into cw-f-dev
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 15:19:58 +0000 (15:19 +0000)]
Merge changes from topic "nyc-dev-check-pkt-when-processing-gatt-reads" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: 810e669d7a am: d618664a5f am: 775e7073a4
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: 810e669d7a am: d618664a5f
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: 810e669d7a
  DO NOT MERGE Handle bad packet length in gatts_process_read_req

6 years agoMerge changes from topic "nyc-dev-check-pkt-when-processing-gatt-reads" into nyc...
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 15:19:58 +0000 (15:19 +0000)]
Merge changes from topic "nyc-dev-check-pkt-when-processing-gatt-reads" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: 810e669d7a am: d618664a5f
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: 810e669d7a
  DO NOT MERGE Handle bad packet length in gatts_process_read_req

6 years agoMerge changes from topic "nyc-dev-check-pkt-when-processing-gatt-reads" into nyc...
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 15:19:58 +0000 (15:19 +0000)]
Merge changes from topic "nyc-dev-check-pkt-when-processing-gatt-reads" into nyc-dr1-dev

* changes:
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: 810e669d7a
  DO NOT MERGE Handle bad packet length in gatts_process_read_req

6 years agoMerge "DO NOT MERGE Handle bad packet length in gatts_process_read_req" into nyc-dev
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 15:19:58 +0000 (15:19 +0000)]
Merge "DO NOT MERGE Handle bad packet length in gatts_process_read_req" into nyc-dev

6 years agoMerge changes from topic "nyc-dev-check-pkt-when-processing-gatt-reads" into oc-dev
commit | commitdiff | tree
TreeHugger Robot [Wed, 11 Apr 2018 15:19:58 +0000 (15:19 +0000)]
Merge changes from topic "nyc-dev-check-pkt-when-processing-gatt-reads" into oc-dev

* changes:
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: 810e669d7a am: d618664a5f am: 775e7073a4 am: c39fc2ed94 skipped: 40d50bb926
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: 810e669d7a am: d618664a5f am: 775e7073a4 am: c39fc2ed94
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: 810e669d7a am: d618664a5f am: 775e7073a4
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: 810e669d7a am: d618664a5f
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: 810e669d7a
  DO NOT MERGE Handle bad packet length in gatts_process_read_req

6 years agoMerge "DO NOT MERGE Drop LE CoC fragments when frame size is too big" into oc-dev
commit | commitdiff | tree
TreeHugger Robot [Tue, 10 Apr 2018 20:37:39 +0000 (20:37 +0000)]
Merge "DO NOT MERGE Drop LE CoC fragments when frame size is too big" into oc-dev

6 years agoMerge "DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result" into oc-dev
commit | commitdiff | tree
TreeHugger Robot [Mon, 9 Apr 2018 21:51:37 +0000 (21:51 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result" into oc-dev

6 years agoMerge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into nyc-mr2-dev
commit | commitdiff | tree
TreeHugger Robot [Mon, 9 Apr 2018 20:41:56 +0000 (20:41 +0000)]
Merge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61 am: 0592daaae0 am: ae857fb5d5 am: 05a0d17de2
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61 am: 0592daaae0 am: ae857fb5d5
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61 am: 0592daaae0
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b
  DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result

6 years agoMerge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into cw-f-dev
commit | commitdiff | tree
TreeHugger Robot [Mon, 9 Apr 2018 20:41:56 +0000 (20:41 +0000)]
Merge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61 am: 0592daaae0 am: ae857fb5d5
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61 am: 0592daaae0
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b
  DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result

6 years agoMerge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into nyc-mr1-dev
commit | commitdiff | tree
TreeHugger Robot [Mon, 9 Apr 2018 20:41:56 +0000 (20:41 +0000)]
Merge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61 am: 0592daaae0
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b
  DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result

6 years agoMerge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into nyc-dr1-dev
commit | commitdiff | tree
TreeHugger Robot [Mon, 9 Apr 2018 20:41:56 +0000 (20:41 +0000)]
Merge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into nyc-dr1-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b
  DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result

6 years agoMerge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into nyc-dev
commit | commitdiff | tree
TreeHugger Robot [Mon, 9 Apr 2018 20:41:56 +0000 (20:41 +0000)]
Merge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into nyc-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b
  DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result

6 years agoMerge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into oc-dev
commit | commitdiff | tree
TreeHugger Robot [Mon, 9 Apr 2018 20:41:56 +0000 (20:41 +0000)]
Merge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into oc-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61 am: 0592daaae0 am: ae857fb5d5 am: 05a0d17de2 skipped: 6a6eadc2e4
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61 am: 0592daaae0 am: ae857fb5d5 am: 05a0d17de2
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61 am: 0592daaae0 am: ae857fb5d5
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61 am: 0592daaae0
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b
  DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result

6 years agoMerge changes from topic "am-67cc014c-1372-4bfa-8272-45a792f72a05" into nyc-mr2-dev
commit | commitdiff | tree
TreeHugger Robot [Mon, 9 Apr 2018 20:41:27 +0000 (20:41 +0000)]
Merge changes from topic "am-67cc014c-1372-4bfa-8272-45a792f72a05" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1 am: dbe2d9451f am: 11fb9e98f6 am: de43e591ab
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1 am: dbe2d9451f am: 11fb9e98f6
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1 am: dbe2d9451f
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1
  DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result

6 years agoMerge changes from topic "am-67cc014c-1372-4bfa-8272-45a792f72a05" into cw-f-dev
commit | commitdiff | tree
TreeHugger Robot [Mon, 9 Apr 2018 20:41:27 +0000 (20:41 +0000)]
Merge changes from topic "am-67cc014c-1372-4bfa-8272-45a792f72a05" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1 am: dbe2d9451f am: 11fb9e98f6
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1 am: dbe2d9451f
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1
  DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result

6 years agoMerge changes from topic "am-67cc014c-1372-4bfa-8272-45a792f72a05" into nyc-mr1-dev
commit | commitdiff | tree
TreeHugger Robot [Mon, 9 Apr 2018 20:41:27 +0000 (20:41 +0000)]
Merge changes from topic "am-67cc014c-1372-4bfa-8272-45a792f72a05" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1 am: dbe2d9451f
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1
  DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result

6 years agoMerge changes from topic "am-67cc014c-1372-4bfa-8272-45a792f72a05" into nyc-dr1-dev
commit | commitdiff | tree
TreeHugger Robot [Mon, 9 Apr 2018 20:41:27 +0000 (20:41 +0000)]
Merge changes from topic "am-67cc014c-1372-4bfa-8272-45a792f72a05" into nyc-dr1-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1
  DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result

6 years agoMerge "DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result" into nyc-dev
commit | commitdiff | tree
TreeHugger Robot [Mon, 9 Apr 2018 20:41:27 +0000 (20:41 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result" into nyc-dev

6 years agoMerge changes from topic "am-67cc014c-1372-4bfa-8272-45a792f72a05" into oc-dev
commit | commitdiff | tree
TreeHugger Robot [Mon, 9 Apr 2018 20:41:27 +0000 (20:41 +0000)]
Merge changes from topic "am-67cc014c-1372-4bfa-8272-45a792f72a05" into oc-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1 am: dbe2d9451f am: 11fb9e98f6 am: de43e591ab skipped: d37abe6045
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1 am: dbe2d9451f am: 11fb9e98f6 am: de43e591ab
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1 am: dbe2d9451f am: 11fb9e98f6
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1 am: dbe2d9451f
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1
  DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result

6 years ago[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 9 Apr 2018 16:36:55 +0000 (16:36 +0000)]
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: 810e669d7a am: d618664a5f am: 775e7073a4 am: c39fc2ed94 skipped: 40d50bb926

Change-Id: I234648d0dd27c8806a3d08a38a3b2b7085895ea5

6 years ago[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 9 Apr 2018 16:36:52 +0000 (16:36 +0000)]
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: 810e669d7a am: d618664a5f am: 775e7073a4 am: c39fc2ed94

Change-Id: Idff7dd4c76ea75fa918207d264b37e1ccdfbf63f

6 years ago[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 9 Apr 2018 16:36:49 +0000 (16:36 +0000)]
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: 810e669d7a am: d618664a5f am: 775e7073a4

Change-Id: Ie5ecd3833698fbe2b5ad807429598f426301604c

6 years ago[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 9 Apr 2018 16:36:46 +0000 (16:36 +0000)]
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: 810e669d7a am: d618664a5f

Change-Id: Ic54a4c7f7bbb567d01caa25734e026d245db86f5

6 years ago[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 9 Apr 2018 16:36:43 +0000 (16:36 +0000)]
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: 810e669d7a

Change-Id: I5df75e382fe9438aad5896d60d5697f21f0a140d

6 years agoDO NOT MERGE Handle bad packet length in gatts_process_read_req
commit | commitdiff | tree
Stanley Tng [Thu, 5 Apr 2018 16:54:13 +0000 (09:54 -0700)]
DO NOT MERGE Handle bad packet length in gatts_process_read_req

Added error check and handling code in gatts_process_read_req to
make sure that the packet length is correct.
Please note that there is another earlier CL that is reverted and this
is the updated one.

Bug: 73172115
Test: Run the test program, poc, that was attached in the bug report
Merged-In: Ia9b4e502fa8f8384bf9767e68f73b48a0915141b
Change-Id: Ia9b4e502fa8f8384bf9767e68f73b48a0915141b
(cherry picked from commit cc9c7330d1c3507d745170ae7b2e0546197b7acb)

6 years ago[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 9 Apr 2018 16:22:49 +0000 (16:22 +0000)]
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647 am: 2040db3cf0 am: 4d69ee4e17 am: 39da18a12c am: 20e297a2ba skipped: 45591ce16e

Change-Id: I0bb230430866d6ee0b079a390147748cbd33f49d

6 years ago[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 9 Apr 2018 16:22:47 +0000 (16:22 +0000)]
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647 am: 2040db3cf0 am: 4d69ee4e17 am: 39da18a12c am: 20e297a2ba

Change-Id: I272f145e0282dfad23f8c25ab6034826219917ac

6 years ago[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 9 Apr 2018 16:22:45 +0000 (16:22 +0000)]
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647 am: 2040db3cf0 am: 4d69ee4e17 am: 39da18a12c

Change-Id: Ic44f6d12a5665e72e07913a07b2f6a3313fe82c6

6 years ago[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 9 Apr 2018 16:22:44 +0000 (16:22 +0000)]
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647 am: 2040db3cf0 am: 4d69ee4e17

Change-Id: I18cc116c7fc24a7618e7c18a5fb51cf9e0dcf4d1

6 years ago[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 9 Apr 2018 16:22:42 +0000 (16:22 +0000)]
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647 am: 2040db3cf0

Change-Id: I2d538074f5a8e6fea85019adf03c1679994cdb16

6 years ago[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 9 Apr 2018 16:22:40 +0000 (16:22 +0000)]
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647

Change-Id: I382274e4bad3579bbb1030640b38469d0901cdf4

6 years ago[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 9 Apr 2018 16:22:39 +0000 (16:22 +0000)]
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e

Change-Id: Ie97dff2f752770f39874af0f824f31a3b820a70d

6 years ago[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 9 Apr 2018 16:22:37 +0000 (16:22 +0000)]
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b

Change-Id: I349cfe1aad0c6856a5818186774c3e3174307462

6 years ago[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 9 Apr 2018 16:22:35 +0000 (16:22 +0000)]
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39

Change-Id: I70949f88b0e060f0923aa0a942a9d785c1802684

6 years agoDO NOT MERGE Handle bad packet length in gatts_process_read_req
commit | commitdiff | tree
Stanley Tng [Thu, 5 Apr 2018 16:54:13 +0000 (09:54 -0700)]
DO NOT MERGE Handle bad packet length in gatts_process_read_req

Added error check and handling code in gatts_process_read_req to
make sure that the packet length is correct.
Please note that there is another earlier CL that is reverted and this
is the updated one.

Bug: 73172115
Test: Run the test program, poc, that was attached in the bug report
Merged-In: Ia9b4e502fa8f8384bf9767e68f73b48a0915141b
Change-Id: Ia9b4e502fa8f8384bf9767e68f73b48a0915141b
(cherry picked from commit cc9c7330d1c3507d745170ae7b2e0546197b7acb)

6 years agoMerge "DO NOT MERGE Fix unexpected behavior in smp_sm_event" into oc-dev
commit | commitdiff | tree
TreeHugger Robot [Fri, 6 Apr 2018 23:41:24 +0000 (23:41 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in smp_sm_event" into oc-dev

6 years agoMerge changes from topic "nyc-dev-fix-l2cap-bad-pkt" into nyc-mr2-dev
commit | commitdiff | tree
TreeHugger Robot [Fri, 6 Apr 2018 22:41:24 +0000 (22:41 +0000)]
Merge changes from topic "nyc-dev-fix-l2cap-bad-pkt" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab9efd am: e4bd77b256 am: 197f2a3893 am: a29c667c1a
  [automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab9efd am: e4bd77b256 am: 197f2a3893
  [automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab9efd am: e4bd77b256
  [automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab9efd
  DO NOT MERGE Drop LE CoC fragments when frame size is too big

6 years agoMerge changes from topic "nyc-dev-fix-l2cap-bad-pkt" into cw-f-dev
commit | commitdiff | tree
TreeHugger Robot [Fri, 6 Apr 2018 22:41:24 +0000 (22:41 +0000)]
Merge changes from topic "nyc-dev-fix-l2cap-bad-pkt" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab9efd am: e4bd77b256 am: 197f2a3893
  [automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab9efd am: e4bd77b256
  [automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab9efd
  DO NOT MERGE Drop LE CoC fragments when frame size is too big

6 years agoMerge changes from topic "nyc-dev-fix-l2cap-bad-pkt" into nyc-mr1-dev
commit | commitdiff | tree
TreeHugger Robot [Fri, 6 Apr 2018 22:41:24 +0000 (22:41 +0000)]
Merge changes from topic "nyc-dev-fix-l2cap-bad-pkt" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab9efd am: e4bd77b256
  [automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab9efd
  DO NOT MERGE Drop LE CoC fragments when frame size is too big

6 years agoMerge changes from topic "nyc-dev-fix-l2cap-bad-pkt" into nyc-dr1-dev
commit | commitdiff | tree
TreeHugger Robot [Fri, 6 Apr 2018 22:41:24 +0000 (22:41 +0000)]
Merge changes from topic "nyc-dev-fix-l2cap-bad-pkt" into nyc-dr1-dev

* changes:
  [automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab9efd
  DO NOT MERGE Drop LE CoC fragments when frame size is too big

6 years agoMerge "DO NOT MERGE Drop LE CoC fragments when frame size is too big" into nyc-dev
commit | commitdiff | tree
TreeHugger Robot [Fri, 6 Apr 2018 22:41:24 +0000 (22:41 +0000)]
Merge "DO NOT MERGE Drop LE CoC fragments when frame size is too big" into nyc-dev

6 years agoMerge changes from topic "nyc-dev-fix-l2cap-bad-pkt" into oc-dev
commit | commitdiff | tree
TreeHugger Robot [Fri, 6 Apr 2018 22:41:24 +0000 (22:41 +0000)]
Merge changes from topic "nyc-dev-fix-l2cap-bad-pkt" into oc-dev

* changes:
  [automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab9efd am: e4bd77b256 am: 197f2a3893 am: a29c667c1a skipped: 9e5aa5c98f
  [automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab9efd am: e4bd77b256 am: 197f2a3893 am: a29c667c1a
  [automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab9efd am: e4bd77b256 am: 197f2a3893
  [automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab9efd am: e4bd77b256
  [automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab9efd
  DO NOT MERGE Drop LE CoC fragments when frame size is too big

6 years agoMerge changes from topic "am-052c6ecb-b5c1-4a10-9d60-0251d0e6f8d6" into nyc-mr2-dev
commit | commitdiff | tree
TreeHugger Robot [Fri, 6 Apr 2018 22:30:25 +0000 (22:30 +0000)]
Merge changes from topic "am-052c6ecb-b5c1-4a10-9d60-0251d0e6f8d6" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 61c9430c58 am: 058e2df213 am: 917f3d5e22 am: bd4d802773
  [automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 61c9430c58 am: 058e2df213 am: 917f3d5e22
  [automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 61c9430c58 am: 058e2df213
  [automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 61c9430c58
  DO NOT MERGE Fix unexpected behavior in smp_sm_event

6 years agoMerge changes from topic "am-052c6ecb-b5c1-4a10-9d60-0251d0e6f8d6" into cw-f-dev
commit | commitdiff | tree
TreeHugger Robot [Fri, 6 Apr 2018 22:30:25 +0000 (22:30 +0000)]
Merge changes from topic "am-052c6ecb-b5c1-4a10-9d60-0251d0e6f8d6" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 61c9430c58 am: 058e2df213 am: 917f3d5e22
  [automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 61c9430c58 am: 058e2df213
  [automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 61c9430c58
  DO NOT MERGE Fix unexpected behavior in smp_sm_event

6 years agoMerge changes from topic "am-052c6ecb-b5c1-4a10-9d60-0251d0e6f8d6" into nyc-mr1-dev
commit | commitdiff | tree
TreeHugger Robot [Fri, 6 Apr 2018 22:30:25 +0000 (22:30 +0000)]
Merge changes from topic "am-052c6ecb-b5c1-4a10-9d60-0251d0e6f8d6" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 61c9430c58 am: 058e2df213
  [automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 61c9430c58
  DO NOT MERGE Fix unexpected behavior in smp_sm_event

6 years agoMerge changes from topic "am-052c6ecb-b5c1-4a10-9d60-0251d0e6f8d6" into nyc-dr1-dev
commit | commitdiff | tree
TreeHugger Robot [Fri, 6 Apr 2018 22:30:25 +0000 (22:30 +0000)]
Merge changes from topic "am-052c6ecb-b5c1-4a10-9d60-0251d0e6f8d6" into nyc-dr1-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 61c9430c58
  DO NOT MERGE Fix unexpected behavior in smp_sm_event

6 years agoMerge "DO NOT MERGE Fix unexpected behavior in smp_sm_event" into nyc-dev
commit | commitdiff | tree
TreeHugger Robot [Fri, 6 Apr 2018 22:30:25 +0000 (22:30 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in smp_sm_event" into nyc-dev

6 years agoMerge changes from topic "am-052c6ecb-b5c1-4a10-9d60-0251d0e6f8d6" into oc-dev
commit | commitdiff | tree
TreeHugger Robot [Fri, 6 Apr 2018 22:30:25 +0000 (22:30 +0000)]
Merge changes from topic "am-052c6ecb-b5c1-4a10-9d60-0251d0e6f8d6" into oc-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 61c9430c58 am: 058e2df213 am: 917f3d5e22 am: bd4d802773 skipped: 78dcd6eee6
  [automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 61c9430c58 am: 058e2df213 am: 917f3d5e22 am: bd4d802773
  [automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 61c9430c58 am: 058e2df213 am: 917f3d5e22
  [automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 61c9430c58 am: 058e2df213
  [automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 61c9430c58
  DO NOT MERGE Fix unexpected behavior in smp_sm_event

6 years ago[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab...
commit | commitdiff | tree
Android Build Merger (Role) [Thu, 5 Apr 2018 00:07:04 +0000 (00:07 +0000)]
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab9efd am: e4bd77b256 am: 197f2a3893 am: a29c667c1a skipped: 9e5aa5c98f

Change-Id: I3bdb8e4f5defef9034e4b3d86412b1ae738095e3

6 years ago[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab...
commit | commitdiff | tree
Android Build Merger (Role) [Thu, 5 Apr 2018 00:07:02 +0000 (00:07 +0000)]
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab9efd am: e4bd77b256 am: 197f2a3893 am: a29c667c1a

Change-Id: I02e4726181241715843b48e7d4f06b962b434438

6 years ago[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab...
commit | commitdiff | tree
Android Build Merger (Role) [Thu, 5 Apr 2018 00:07:01 +0000 (00:07 +0000)]
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab9efd am: e4bd77b256 am: 197f2a3893

Change-Id: I098a1f34ba3e5dd419bb019b643e5ae22d8fbb63

6 years ago[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab...
commit | commitdiff | tree
Android Build Merger (Role) [Thu, 5 Apr 2018 00:06:59 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab9efd am: e4bd77b256

Change-Id: I0396a059146eab90983a49b846bc86c1905a8f20

6 years ago[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab9efd
commit | commitdiff | tree
Android Build Merger (Role) [Thu, 5 Apr 2018 00:06:57 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab9efd

Change-Id: I0b963de5871e4bf4c8fb8115376e1badc9c06803

6 years agoDO NOT MERGE Drop LE CoC fragments when frame size is too big
commit | commitdiff | tree
Stanley Tng [Wed, 4 Apr 2018 23:38:22 +0000 (16:38 -0700)]
DO NOT MERGE Drop LE CoC fragments when frame size is too big

Drop the LE CoC data fragments when the received fragment size is too
big.

Test: Runs LE CoC SL4A test, BleCocTest.
Bug: 75298652
Merged-In: I529944341e9e67a39e7ec7e740d5ada3db8cc23a
Change-Id: I529944341e9e67a39e7ec7e740d5ada3db8cc23a

6 years agoDO NOT MERGE Drop LE CoC fragments when frame size is too big
commit | commitdiff | tree
Stanley Tng [Thu, 29 Mar 2018 00:12:28 +0000 (17:12 -0700)]
DO NOT MERGE Drop LE CoC fragments when frame size is too big

Drop the LE CoC data fragments when the received fragment size is too
big.

Test: Runs LE CoC SL4A test, BleCocTest.
Bug: 75298652
Merged-In: I529944341e9e67a39e7ec7e740d5ada3db8cc23a
Change-Id: I529944341e9e67a39e7ec7e740d5ada3db8cc23a
(cherry picked from commit 8365a2ace5e89d8b81bab468f0f9bc1137d773b4)

6 years agoDO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result
commit | commitdiff | tree
Hansong Zhang [Mon, 2 Apr 2018 17:05:56 +0000 (10:05 -0700)]
DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result

Check the number of UUIDs from remote device

Bug: 74016921
Test: manual
Change-Id: Ia13f34578a046faf03506cfe10680dd5c93b1af6
Merged-In: I1ca1f66bfc935f5fd219e8147511bdac7d2789ef

6 years ago[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 2 Apr 2018 18:58:22 +0000 (18:58 +0000)]
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: e04c8be75d am: e2a17a082f am: ecb0bd81a9 am: dfbfd5cb0a skipped: b5577b5144

Change-Id: I7fb5bd917e98c34cdd2d90f5a8fa321ca6f67967

6 years ago[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 2 Apr 2018 18:58:21 +0000 (18:58 +0000)]
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: e04c8be75d am: e2a17a082f am: ecb0bd81a9 am: dfbfd5cb0a

Change-Id: Ie0c6807600d7856388b9dfa0caf139854a3a1fc4

6 years ago[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 2 Apr 2018 18:58:19 +0000 (18:58 +0000)]
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: e04c8be75d am: e2a17a082f am: ecb0bd81a9

Change-Id: Ie8131719a9485f5d8f51d1dc5e86521d2d8de4e2

6 years ago[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 2 Apr 2018 18:58:17 +0000 (18:58 +0000)]
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: e04c8be75d am: e2a17a082f

Change-Id: I4ec15388822b29a74dde745968e595e5a939ff4a

6 years ago[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 2 Apr 2018 18:58:15 +0000 (18:58 +0000)]
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: e04c8be75d

Change-Id: I370d1c516fc30f5efc166b1800e9cc388fd71dd9

6 years agoDO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
commit | commitdiff | tree
Myles Watson [Wed, 21 Mar 2018 23:45:32 +0000 (16:45 -0700)]
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback

Change I63b857d031c55d3a0754e4101e330843eb422b2a caused a double
free.  Move the free call to pan_data_buf_ind_cb().

Free the buffer before every return in pan_data_buf_ind_cb.

Bug: 74950468
Test: manual tethering test with DUT sharing its connection
Change-Id: If4526f3042699581e2cdde79a362eef0f83768eb
Merged-In: If4526f3042699581e2cdde79a362eef0f83768eb
(cherry picked from commit 2e0deb1d135805b37697f0e02a55269c6cc500fe)

6 years ago[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 2 Apr 2018 18:47:19 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8 am: 73cc697204 am: f1d2dd756e am: e8017c52aa am: e68784be2b skipped: a8ea3b27b4

Change-Id: I00e782bed8da09fd7f0150976ff2f8de16516d62

6 years ago[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 2 Apr 2018 18:47:17 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8 am: 73cc697204 am: f1d2dd756e am: e8017c52aa am: e68784be2b

Change-Id: I2e302ea3f7b28badff63cf21da1069910fb4a022

6 years ago[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 2 Apr 2018 18:47:16 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8 am: 73cc697204 am: f1d2dd756e am: e8017c52aa

Change-Id: I280f4529dcc333bd7d0b885fa4a456b35f2c49c2

6 years ago[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 2 Apr 2018 18:47:15 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8 am: 73cc697204 am: f1d2dd756e

Change-Id: If1930c9dbdd92e9d8f041554ba04705fac7130da

6 years ago[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 2 Apr 2018 18:47:13 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8 am: 73cc697204

Change-Id: I8d5ffc61e0326af494165f40167162301f31df27

6 years ago[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 2 Apr 2018 18:47:12 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8

Change-Id: Ieb162bb1cd63758ac343389e381923c488bce206

6 years ago[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 2 Apr 2018 18:47:11 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61

Change-Id: Ieccfefa8032ec1a515e8df3d6e618e5d7e470b44

6 years ago[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 2 Apr 2018 18:47:09 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6

Change-Id: I21d5a838027481e8f55d47fd21a83f837efa2429

6 years ago[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am...
commit | commitdiff | tree
Android Build Merger (Role) [Mon, 2 Apr 2018 18:47:08 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48

Change-Id: If70f1c69d8d8d8de9fbeae55de123f9dba3b8bf8

6 years agoDO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
commit | commitdiff | tree
Myles Watson [Wed, 21 Mar 2018 23:45:32 +0000 (16:45 -0700)]
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback

Change I63b857d031c55d3a0754e4101e330843eb422b2a caused a double
free.  Move the free call to pan_data_buf_ind_cb().

Free the buffer before every return in pan_data_buf_ind_cb.

Bug: 74950468
Test: manual tethering test with DUT sharing its connection
Change-Id: If4526f3042699581e2cdde79a362eef0f83768eb
Merged-In: If4526f3042699581e2cdde79a362eef0f83768eb
(cherry picked from commit 2e0deb1d135805b37697f0e02a55269c6cc500fe)

next
system/bt
About OSDN
Find Software
Develop Software
Help