From: Zhihai Xu <zhihaixu@google.com>
Date: Wed, 25 Sep 2013 01:22:29 +0000 (-0700)
Subject: bluetooth crash caused by read phone book with invalid colummn number -1
X-Git-Tag: android-7.1.2_r17~914^2~21^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=abf19e783556a93cfdd33468454a309ed347bfc4;p=android-x86%2Fpackages-apps-Bluetooth.git

bluetooth crash caused by read phone book with invalid colummn number -1

bug:10919257
Change-Id: I584d5c5c65e26cacfab227742b98c49282710f68
---

diff --git a/src/com/android/bluetooth/hfp/AtPhonebook.java b/src/com/android/bluetooth/hfp/AtPhonebook.java
index e2c1227d..4528bd6c 100755
--- a/src/com/android/bluetooth/hfp/AtPhonebook.java
+++ b/src/com/android/bluetooth/hfp/AtPhonebook.java
@@ -509,8 +509,10 @@ public class AtPhonebook {
                 }
                 if (DBG && name == null) log("Caller ID lookup failed for " + number);
 
-            } else {
+            } else if (pbr.nameColumn != -1) {
                 name = pbr.cursor.getString(pbr.nameColumn);
+            } else {
+                log("processCpbrCommand: empty name and number");
             }
             if (name == null) name = "";
             name = name.trim();