diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-10-17 20:37:50 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-17 20:37:50 -0700 |
| commit | 6ea69cfb708e3b671f26f48f41877d055ec0b547 (patch) | |
| tree | 03eebdab11d699b5f7af0d37c2f79ddc35498901 | |
| parent | 26c8545a19cff4da4928ff6f24343ab5276097b0 (diff) | |
| parent | ae49b1522e7eeade8eaf7d3fe369e049d7472ad3 (diff) | |
| download | android_system_bt-6ea69cfb708e3b671f26f48f41877d055ec0b547.tar.gz android_system_bt-6ea69cfb708e3b671f26f48f41877d055ec0b547.tar.bz2 android_system_bt-6ea69cfb708e3b671f26f48f41877d055ec0b547.zip | |
Merge "Bluetooth: Initialize AV SM before enabling A2DP service"
| -rw-r--r-- | btif/src/btif_av.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/btif/src/btif_av.c b/btif/src/btif_av.c index 4a7173a86..fd587fdf6 100644 --- a/btif/src/btif_av.c +++ b/btif/src/btif_av.c @@ -2046,7 +2046,6 @@ bt_status_t btif_av_init(int service_id) if (!btif_a2dp_start_media_task()) return BT_STATUS_FAIL; btif_av_cb[0].service = service_id; - btif_enable_service(service_id); /* Also initialize the AV state machine */ for (i = 0; i < btif_max_av_clients; i++) @@ -2054,6 +2053,8 @@ bt_status_t btif_av_init(int service_id) btif_av_cb[i].sm_handle = btif_sm_init((const btif_sm_handler_t*)btif_av_state_handlers, BTIF_AV_STATE_IDLE, i); } + + btif_enable_service(service_id); btif_a2dp_on_init(); } |