From: Mudumba Ananth <ananthm@broadcom.com>
Date: Wed, 6 May 2015 16:15:41 +0000 (-0700)
Subject: Fix BT PAN crash by re-ordering callback initialization
X-Git-Tag: android-x86-7.1-r1~394^2~216^2~144
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f4f744f7;p=android-x86%2Fsystem-bt.git

Fix BT PAN crash by re-ordering callback initialization

Bug: 20868163
Change-Id: I8e3bb844b96b762f90a85d8d9d678a1a9cec9c32
---

diff --git a/btif/src/btif_pan.c b/btif/src/btif_pan.c
index 55e04c8db..5d0ae6628 100644
--- a/btif/src/btif_pan.c
+++ b/btif/src/btif_pan.c
@@ -175,10 +175,10 @@ static btpan_callbacks_t callback;
 static bt_status_t btpan_jni_init(const btpan_callbacks_t* callbacks)
 {
     BTIF_TRACE_DEBUG("stack_initialized = %d, btpan_cb.enabled:%d", stack_initialized, btpan_cb.enabled);
-    jni_initialized = true;
-    if (!stack_initialized && !btpan_cb.enabled)
-        btif_pan_init();
     callback = *callbacks;
+    jni_initialized = TRUE;
+    if (stack_initialized && !btpan_cb.enabled)
+        btif_pan_init();
     return BT_STATUS_SUCCESS;
 }