diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-11 08:32:01 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-11 08:32:01 -0700 |
| commit | 5e6eca1665f435dbad070856abde9757d57581c2 (patch) | |
| tree | 58f796eb1217d56513cf5fd5d2cc2d5f0d772079 | |
| parent | d944ea7799d713e4b180c46513e08f2121325f7a (diff) | |
| parent | 412ad2cc272c31162422980cc491a8e0c3675cd6 (diff) | |
| download | android_packages_apps_Dialer-5e6eca1665f435dbad070856abde9757d57581c2.tar.gz android_packages_apps_Dialer-5e6eca1665f435dbad070856abde9757d57581c2.tar.bz2 android_packages_apps_Dialer-5e6eca1665f435dbad070856abde9757d57581c2.zip | |
Merge "Dialer: fix the runtime exception issue for smartsearch."
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/dialer/database/DialerDatabaseHelper.java | 22 |
2 files changed, 20 insertions, 4 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 6d94d8eaa..48d49af2f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1161,4 +1161,6 @@ e mode.</string> <string name="alert_call_over_wifi">Calls will be made over Wi-Fi.</string> <string name="alert_call_no_cellular_coverage">No cellular network available. Connect to available Wi-Fi to make calls.</string> <string name="alert_user_connect_to_wifi_for_call">Connect to Wi-Fi to make calls.</string> + <string name="missing_account_type">(No type)</string> + <string name="missing_account_name">(No name)</string> </resources> diff --git a/src/com/android/dialer/database/DialerDatabaseHelper.java b/src/com/android/dialer/database/DialerDatabaseHelper.java index 1d3de3102..2d9b8aa1d 100644 --- a/src/com/android/dialer/database/DialerDatabaseHelper.java +++ b/src/com/android/dialer/database/DialerDatabaseHelper.java @@ -943,10 +943,24 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper { insert.bindLong(12, updatedContactCursor.getInt(PhoneQuery.PHONE_IS_PRIMARY)); insert.bindLong(13, updatedContactCursor.getInt(PhoneQuery.PHONE_CARRIER_PRESENCE)); insert.bindLong(14, currentMillis); - insert.bindString(15, updatedContactCursor - .getString(PhoneQuery.PHONE_ACCOUNT_TYPE)); - insert.bindString(16, updatedContactCursor - .getString(PhoneQuery.PHONE_ACCOUNT_NAME)); + + final String accountType = updatedContactCursor.getString( + PhoneQuery.PHONE_ACCOUNT_TYPE); + if (accountType == null) { + insert.bindString(15, mContext.getResources().getString( + R.string.missing_account_type)); + } else { + insert.bindString(15, accountType); + } + + final String accountName = updatedContactCursor.getString( + PhoneQuery.PHONE_ACCOUNT_NAME); + if (accountName == null) { + insert.bindString(16, mContext.getResources().getString( + R.string.missing_account_name)); + } else { + insert.bindString(16, accountName); + } insert.executeInsert(); final String contactPhoneNumber = updatedContactCursor.getString(PhoneQuery.PHONE_NUMBER); |