Commit 31a84844 authored Sep 25, 2013 by Zhihai Xu Committed by Android Git Automerger Sep 25, 2013

am e69cdf84: am a98645d2: Merge "bluetooth crash caused by read phone book...

am e69cdf84: am a98645d2: Merge "bluetooth crash caused by read phone book with invalid colummn number -1" into klp-dev

* commit 'e69cdf84':
  bluetooth crash caused by read phone book with invalid colummn number -1

parents f01475d7 e69cdf84

android/app/src/com/android/bluetooth/hfp/AtPhonebook.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -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();