commit 2334344102581597532dbb6cff5c921091ce7754
author Matthew Xie <mattx@google.com> Tue Nov 18 02:08:30 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 18 02:08:30 2014 +0000
tree 9ba3934c41d4cc3759c964ec575e806a92104b53
parent bda59f88101f39f82bb81a0d21e8ca1f73d36e4f
parent 86f97eda524568f2d264186844450db5e56dac36

am 86f97eda: Use the device type from saved properties instead of assuming default

* commit '86f97eda524568f2d264186844450db5e56dac36':
  Use the device type from saved properties instead of assuming default

btif/src/btif_sock_sdp.c

diff --git a/btif/src/btif_sock_sdp.c b/btif/src/btif_sock_sdp.c
index afd99ce..b2fecdd 100644
--- a/btif/src/btif_sock_sdp.c
+++ b/btif/src/btif_sock_sdp.c
@@ -386,7 +386,7 @@
 
             SDP_AddProfileDescriptorList(sdp_handle,
                 UUID_SERVCLASS_OBEX_OBJECT_PUSH,
-                0x0100);
+                0x0101);
         }
     }
 

stack/gatt/gatt_sr.c

diff --git a/stack/gatt/gatt_sr.c b/stack/gatt/gatt_sr.c
index 2199794..eac00db 100755
--- a/stack/gatt/gatt_sr.c
+++ b/stack/gatt/gatt_sr.c
@@ -123,7 +123,7 @@
 static BOOLEAN process_read_multi_rsp (tGATT_SR_CMD *p_cmd, tGATT_STATUS status,
                                        tGATTS_RSP *p_msg, UINT16 mtu)
 {
-    tGATTS_RSP       *p_rsp;
+    tGATTS_RSP       *p_rsp = NULL;
     UINT16          ii, total_len, len;
     BT_HDR          *p_buf = (BT_HDR *)GKI_getbuf((UINT16)sizeof(tGATTS_RSP));
     UINT8           *p;