git.osdn.net Git - android-x86/system-bt.git/log

OSDN Git Service

(root) / android-x86 / system-bt.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

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

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

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

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

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

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

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

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

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

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)

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

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

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

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

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

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

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

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)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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)

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

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

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

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

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

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

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

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)

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 16:58:43 +0000 (16:58 +0000)]

[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

Change-Id: I8b7d25413a505d9ef3989e3d36607a7c83ff99e6

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 16:58:41 +0000 (16:58 +0000)]

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

Change-Id: I4ff82057f6e839a8941becb5566555fb1d8f78a5

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 16:58:35 +0000 (16:58 +0000)]

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

Change-Id: I3f3d68bac43d0a4673a4b21b1801da79f7841b53

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 16:58:33 +0000 (16:58 +0000)]

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

Change-Id: I30ae8f458e18a4b4fb2c8457dca65ce68307cf46

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 16:58:32 +0000 (16:58 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9

Change-Id: I9d0d9847904b361d457bba6b0f7dba6db9e6e10a

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 16:58:30 +0000 (16:58 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874

Change-Id: I4560a77109abd6772f9a7ef7808d073699e23dc5

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 16:58:28 +0000 (16:58 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b

Change-Id: I45246189f80aedb86c70064d85006ac8f5ba00ac

commit | commitdiff | tree

Hansong Zhang [Mon, 2 Apr 2018 16:55:58 +0000 (09:55 -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: I5d3a90bad63af5b22dd155f1d60869b8149d350c

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 16:51:22 +0000 (16:51 +0000)]

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

Change-Id: Ia8a05230155e3dc89ee2c87dad2a3d32d609c7df

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 16:51:20 +0000 (16:51 +0000)]

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

Change-Id: I8248ec75159250a70f991ee28a0889c75340f1aa

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 16:51:18 +0000 (16:51 +0000)]

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

Change-Id: Ib7a1956032b8c363aaa47d249e6ec784c6690412

commit | commitdiff | tree

Hansong Zhang [Mon, 2 Apr 2018 16:29:49 +0000 (09:29 -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: I7e1fd420c96bdb4d8b1bb129eb85045f9e3da443

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:29 +0000 (23:57 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74 am: d9af1fffcb am: f5960e961c skipped: 37a3914a42 am: 8fd38dcd3c am: d58ad85a12 am: cd6784f464

Change-Id: Ia05aec96a9297845ed8f998f34507faf2eb562aa

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:27 +0000 (23:57 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74 am: d9af1fffcb am: f5960e961c skipped: 37a3914a42 am: 8fd38dcd3c am: d58ad85a12

Change-Id: I2d9e1e774d5694163049a52119fbd67b1ac4b718

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:26 +0000 (23:57 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74 am: d9af1fffcb am: f5960e961c skipped: 37a3914a42 am: 8fd38dcd3c

Change-Id: Ic8a22969dc8b52582eea14f731c00cf0463bd024

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:25 +0000 (23:57 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74 am: d9af1fffcb am: f5960e961c skipped: 37a3914a42

Change-Id: I608a9e64ae1882c318a8bc8f2710990679b496a0

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:23 +0000 (23:57 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74 am: d9af1fffcb am: f5960e961c

Change-Id: Id9f1cb41fde0ced026415ecf20766edd5df593ca

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:22 +0000 (23:57 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74 am: d9af1fffcb

Change-Id: Id73dfb4249a191a95a30edf5e43948c6fcafedb6

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:20 +0000 (23:57 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74

Change-Id: I7c3bc0a75233b759ae029dd7297ea8f77db59723

commit | commitdiff | tree

Hansong Zhang [Fri, 30 Mar 2018 23:55:49 +0000 (16:55 -0700)]

DO NOT MERGE Fix unexpected behavior in smp_sm_event

Bug: 74121126
Test: manual
Change-Id: Ie5dd841d6461ad057c4ab572007f38c5446aba53

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 30 Mar 2018 23:56:17 +0000 (23:56 +0000)]

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

Change-Id: I0277e517cae82234c8ae069c6dd63c5490ece5fe

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 30 Mar 2018 23:56:15 +0000 (23:56 +0000)]

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

Change-Id: Idc62cb9586d417c7ec8fee25810d6ca93747265c

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 30 Mar 2018 23:56:13 +0000 (23:56 +0000)]

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

Change-Id: I4bec7ca811e03099ce24a284ebd9fa580a18fa23

commit | commitdiff | tree

Hansong Zhang [Fri, 30 Mar 2018 23:55:49 +0000 (16:55 -0700)]

DO NOT MERGE Fix unexpected behavior in smp_sm_event

Bug: 74121126
Test: manual
Change-Id: Ie5dd841d6461ad057c4ab572007f38c5446aba53

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 12 Feb 2018 20:56:23 +0000 (20:56 +0000)]

[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response am: 8a6fb36884 am: d4b8f56f02 am: bde10cf7d9

Change-Id: Ic0722cf7a7ca48da60055a050fcb8f924fb18f13

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 12 Feb 2018 20:56:20 +0000 (20:56 +0000)]

[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response am: 8a6fb36884 am: d4b8f56f02

Change-Id: I7d25a311a384582bbe03a7f6d7076ba07788b30a

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 12 Feb 2018 20:56:17 +0000 (20:56 +0000)]

[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response am: 8a6fb36884

Change-Id: I895844919dbff48a2290b717974cd76b58da541b

commit | commitdiff | tree

Ajay Panicker [Fri, 2 Feb 2018 09:11:37 +0000 (01:11 -0800)]

DO NOT MERGE: AVRCP: Check number of text attribute values in response

Test: Build
Bug: 71603410
Change-Id: I6f822b0bc7fc2fb042a70b64cff61583a86b36e2

commit | commitdiff | tree

TreeHugger Robot [Mon, 12 Feb 2018 19:03:46 +0000 (19:03 +0000)]

Merge changes from topic "am-83fa0073-1c66-42ef-b933-72b932ba2be3" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am: aeff2c709c am: 27c7acb0ac am: 04674169fc
  [automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am: aeff2c709c am: 27c7acb0ac
  [automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am: aeff2c709c
  DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to

commit | commitdiff | tree

TreeHugger Robot [Mon, 12 Feb 2018 19:03:46 +0000 (19:03 +0000)]

Merge changes from topic "am-83fa0073-1c66-42ef-b933-72b932ba2be3" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am: aeff2c709c am: 27c7acb0ac
  [automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am: aeff2c709c
  DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to

commit | commitdiff | tree

TreeHugger Robot [Mon, 12 Feb 2018 19:03:46 +0000 (19:03 +0000)]

Merge changes from topic "am-83fa0073-1c66-42ef-b933-72b932ba2be3" into nyc-dr1-dev

* changes:
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am: aeff2c709c
DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to

commit | commitdiff | tree

TreeHugger Robot [Mon, 12 Feb 2018 19:03:46 +0000 (19:03 +0000)]

Merge "DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 12 Feb 2018 19:03:09 +0000 (19:03 +0000)]

Merge changes from topic "am-fb3a89c6-818a-4835-a86a-2acea0eee0a9" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am: 07900311fb am: c32084e577 am: b8387d01a6
  [automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am: 07900311fb am: c32084e577
  [automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am: 07900311fb
  DO NOT MERGE: AVRCP: Check number of text attributes in response

commit | commitdiff | tree

TreeHugger Robot [Mon, 12 Feb 2018 19:03:09 +0000 (19:03 +0000)]

Merge changes from topic "am-fb3a89c6-818a-4835-a86a-2acea0eee0a9" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am: 07900311fb am: c32084e577
  [automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am: 07900311fb
  DO NOT MERGE: AVRCP: Check number of text attributes in response

commit | commitdiff | tree

TreeHugger Robot [Mon, 12 Feb 2018 19:03:09 +0000 (19:03 +0000)]

Merge changes from topic "am-fb3a89c6-818a-4835-a86a-2acea0eee0a9" into nyc-dr1-dev

* changes:
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am: 07900311fb
DO NOT MERGE: AVRCP: Check number of text attributes in response

commit | commitdiff | tree

TreeHugger Robot [Mon, 12 Feb 2018 19:03:09 +0000 (19:03 +0000)]

Merge "DO NOT MERGE: AVRCP: Check number of text attributes in response" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Sat, 10 Feb 2018 19:17:51 +0000 (19:17 +0000)]

Merge changes from topic "am-c41d9dbf-12e7-4386-8be3-987a152ba46e-nyc-dev" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE Truncate new line characters when adding string to config am: 01facbcf97 am: 45c992fd18 am: 2fb2ce2f4e
  [automerger] DO NOT MERGE Truncate new line characters when adding string to config am: 01facbcf97 am: 45c992fd18
  [automerger] DO NOT MERGE Truncate new line characters when adding string to config am: 01facbcf97
  DO NOT MERGE Truncate new line characters when adding string to config

commit | commitdiff | tree

TreeHugger Robot [Sat, 10 Feb 2018 19:17:51 +0000 (19:17 +0000)]

Merge changes from topic "am-c41d9dbf-12e7-4386-8be3-987a152ba46e-nyc-dev" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE Truncate new line characters when adding string to config am: 01facbcf97 am: 45c992fd18
  [automerger] DO NOT MERGE Truncate new line characters when adding string to config am: 01facbcf97
  DO NOT MERGE Truncate new line characters when adding string to config

commit | commitdiff | tree

TreeHugger Robot [Sat, 10 Feb 2018 19:17:51 +0000 (19:17 +0000)]

Merge changes from topic "am-c41d9dbf-12e7-4386-8be3-987a152ba46e-nyc-dev" into nyc-dr1-dev

* changes:
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am: 01facbcf97
DO NOT MERGE Truncate new line characters when adding string to config

commit | commitdiff | tree

TreeHugger Robot [Sat, 10 Feb 2018 19:17:51 +0000 (19:17 +0000)]

Merge "DO NOT MERGE Truncate new line characters when adding string to config" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Feb 2018 00:54:05 +0000 (00:54 +0000)]

[automerger] DO NOT MERGE Truncate new line characters when adding string to config am: 01facbcf97 am: 45c992fd18 am: 2fb2ce2f4e

Change-Id: If09082226b692af642ce8e1f312e9adb6e0280a6

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Feb 2018 00:54:04 +0000 (00:54 +0000)]

[automerger] DO NOT MERGE Truncate new line characters when adding string to config am: 01facbcf97 am: 45c992fd18

Change-Id: I2816fd435f6ffc4366ca02ad5a0beb8d9d795569

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Feb 2018 00:54:03 +0000 (00:54 +0000)]

[automerger] DO NOT MERGE Truncate new line characters when adding string to config am: 01facbcf97

Change-Id: I3d96331b5aa30717f8e6be3c5fe3a91053e69cee

commit | commitdiff | tree

Hansong Zhang [Fri, 9 Feb 2018 23:23:07 +0000 (15:23 -0800)]

DO NOT MERGE Truncate new line characters when adding string to config

Bug: 70808273
Test: test with a device with newline character in name
Change-Id: Ie7e0b5d93047bc12a9cb84cc15f7f68f38f36441

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:48 +0000 (00:52 +0000)]

[automerger] DO NOT MERGE Truncate new line characters when adding string to config am: bb3b4ede88 am: 8b50aeebda am: 1bedd9c901 skipped: 3dcd4e9bfc am: f4e92b98bb am: 49838a27e2 am: 119a768af6

Change-Id: I606382f75f3ef671f4b651b2396f918a2e97d162

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:47 +0000 (00:52 +0000)]

[automerger] DO NOT MERGE Truncate new line characters when adding string to config am: bb3b4ede88 am: 8b50aeebda am: 1bedd9c901 skipped: 3dcd4e9bfc am: f4e92b98bb am: 49838a27e2

Change-Id: I35a049b455aa485a29778f3609cc026952975484

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:46 +0000 (00:52 +0000)]

[automerger] DO NOT MERGE Truncate new line characters when adding string to config am: bb3b4ede88 am: 8b50aeebda am: 1bedd9c901 skipped: 3dcd4e9bfc am: f4e92b98bb

Change-Id: I051f65fd35d9cfc6329dc072fb37ab5b3820de93

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:44 +0000 (00:52 +0000)]

[automerger] DO NOT MERGE Truncate new line characters when adding string to config am: bb3b4ede88 am: 8b50aeebda am: 1bedd9c901 skipped: 3dcd4e9bfc

Change-Id: Ia5e49a4cb49329fd3a2e5b687d9e5372f88b35df

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:43 +0000 (00:52 +0000)]

[automerger] DO NOT MERGE Truncate new line characters when adding string to config am: bb3b4ede88 am: 8b50aeebda am: 1bedd9c901

Change-Id: I17e31eed9ba3a869de51e0c472dd2889bc6a951c

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:41 +0000 (00:52 +0000)]

[automerger] DO NOT MERGE Truncate new line characters when adding string to config am: bb3b4ede88 am: 8b50aeebda

Change-Id: Ia1ab5cc9ce36a3087eff3b7caacab41af9979c18

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:40 +0000 (00:52 +0000)]

[automerger] DO NOT MERGE Truncate new line characters when adding string to config am: bb3b4ede88

Change-Id: I338ba0cef8c7b49da0d305a8e2e0217f19acd19c

commit | commitdiff | tree

Hansong Zhang [Fri, 9 Feb 2018 22:21:09 +0000 (14:21 -0800)]

DO NOT MERGE Truncate new line characters when adding string to config

Bug: 70808273
Test: test with a device with newline character in name
Change-Id: Ie7e0b5d93047bc12a9cb84cc15f7f68f38f36441

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Feb 2018 21:31:50 +0000 (21:31 +0000)]

[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am: 07900311fb am: c32084e577 am: b8387d01a6

Change-Id: I3eaed8b4d5edaeb45609940536effe8f82c63caf

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Feb 2018 21:31:48 +0000 (21:31 +0000)]

[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am: 07900311fb am: c32084e577

Change-Id: I5efb619b0fa81ceff2dbf40cb86c6e9d92ca6483

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Feb 2018 21:31:46 +0000 (21:31 +0000)]

[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am: 07900311fb

Change-Id: I0e5e4ec71db8261994f64b1d1279b836b074762e

commit | commitdiff | tree

Ajay Panicker [Fri, 2 Feb 2018 08:56:43 +0000 (00:56 -0800)]

DO NOT MERGE: AVRCP: Check number of text attributes in response

Test: Build
Bug: 71603315
Change-Id: Ieda5e410057062533ae09bd977bfe7f758a55140

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Feb 2018 07:52:23 +0000 (07:52 +0000)]

[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am: aeff2c709c am: 27c7acb0ac am: 04674169fc

Change-Id: Id16ba673c11bb21522f8f240cc77211e33681ca1

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Feb 2018 07:52:22 +0000 (07:52 +0000)]

[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am: aeff2c709c am: 27c7acb0ac

Change-Id: Idb2c79340f8a89d7bda7215dc56d23a520b3c58f

system/bt

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.