tag | edcf65f9b00db5b908cce406b325b97e0497a437 | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 01 14:14:29 2016 -0700 |
object | 6e0c05a3610fcd00d6e72332a5f33121d9604581 |
Android 6.0.1 Release 56 (MMB30R)
commit | 6e0c05a3610fcd00d6e72332a5f33121d9604581 | [log] [tgz] |
---|---|---|
author | Sharvil Nanavati <sharvil@google.com> | Mon Jun 20 19:16:12 2016 -0700 |
committer | Adam Seaton <aseaton@google.com> | Thu Jun 23 22:18:47 2016 +0000 |
tree | 7690a96295e6fdf4084c6d2f4da7d0619defc66e | |
parent | 5f222ea7935df01d4cea53f1a08591016b12daf9 [diff] |
DO NOT MERGE Fix potential DoS caused by delivering signal to BT process Bug: 28885210 Change-Id: I63866d894bfca47464d6e42e3fb0357c4f94d360 Conflicts: btif/co/bta_hh_co.c btif/src/btif_core.c Merge conflict resolution of ag/1161415 (referencing ag/1164670) - Directly into mnc-mr2-release (cherry picked from commit 472271b153c5dc53c28beac55480a8d8434b2d5c) Change-Id: I3839f4e917ee9e71af42f23d2b300632b48400d3