Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17a2c2c2 authored by Zhihai Xu's avatar Zhihai Xu Committed by Android (Google) Code Review
Browse files

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

parents b3082d83 abf19e78

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();