diff options
| author | Jay Shrauner <shrauner@google.com> | 2014-03-03 23:15:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-03 23:15:06 +0000 |
| commit | 13a8c8c734340d1c263d039aa9bf556b7e78ba8e (patch) | |
| tree | 81c06669eedb38d7cadf103d8c5e79d670e8bdb9 | |
| parent | a84d34e8806bce93ea50f367db1e3f7a2790c4f5 (diff) | |
| parent | 5b8f013a34eee576cc3c12ced3843aaeea3a2ca6 (diff) | |
am 5b8f013a: Merge "Fix NPE in deleted contact removal" into klp-dev
* commit '5b8f013a34eee576cc3c12ced3843aaeea3a2ca6':
Fix NPE in deleted contact removal
| -rw-r--r-- | src/com/android/dialer/database/DialerDatabaseHelper.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/dialer/database/DialerDatabaseHelper.java b/src/com/android/dialer/database/DialerDatabaseHelper.java index 852b7c1b2..d3897c266 100644 --- a/src/com/android/dialer/database/DialerDatabaseHelper.java +++ b/src/com/android/dialer/database/DialerDatabaseHelper.java @@ -511,6 +511,9 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper { DeleteContactQuery.PROJECTION, DeleteContactQuery.SELECT_UPDATED_CLAUSE, new String[] {last_update_time}, null); + if (deletedContactCursor == null) { + return; + } db.beginTransaction(); try { |