diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-03-04 08:32:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-04 08:32:05 +0000 |
| commit | 2413651b03ab45d956a78acf7bb867c4d09b6649 (patch) | |
| tree | e17f28d581ba2146b59adafefd1312befa5c7d9b | |
| parent | f74461a62e5bdc0350f080230dd872230ac10aa4 (diff) | |
| parent | 8f21d5115907faeb2570647154483c06876c6312 (diff) | |
am 8f21d511: am 64492d99: am 0b9af237: am 088b0b81: am d126f874: Fix Dialer OOM when building smart dialling index
* commit '8f21d5115907faeb2570647154483c06876c6312':
Fix Dialer OOM when building smart dialling index
| -rw-r--r-- | src/com/android/dialer/database/DialerDatabaseHelper.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/com/android/dialer/database/DialerDatabaseHelper.java b/src/com/android/dialer/database/DialerDatabaseHelper.java index d3897c266..f6f5f6c3a 100644 --- a/src/com/android/dialer/database/DialerDatabaseHelper.java +++ b/src/com/android/dialer/database/DialerDatabaseHelper.java @@ -163,6 +163,17 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper { /** Selects only rows that have been updated after a certain time stamp.*/ static final String SELECT_UPDATED_CLAUSE = Phone.CONTACT_LAST_UPDATED_TIMESTAMP + " > ?"; + + /** Ignores contacts that have an unreasonably long lookup key. These are likely to be + * the result of multiple (> 50) merged raw contacts, and are likely to cause + * OutOfMemoryExceptions within SQLite, or cause memory allocation problems later on + * when iterating through the cursor set (see b/13133579) + */ + static final String SELECT_IGNORE_LOOKUP_KEY_TOO_LONG_CLAUSE = + "length(" + Phone.LOOKUP_KEY + ") < 1000"; + + static final String SELECTION = SELECT_UPDATED_CLAUSE + " AND " + + SELECT_IGNORE_LOOKUP_KEY_TOO_LONG_CLAUSE; } /** Query options for querying the deleted contact database.*/ @@ -658,7 +669,6 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper { } else { insert.bindString(5, displayName); } - insert.bindLong(1, updatedContactCursor.getLong(PhoneQuery.PHONE_ID)); insert.bindLong(3, updatedContactCursor.getLong(PhoneQuery.PHONE_CONTACT_ID)); insert.bindLong(6, updatedContactCursor.getLong(PhoneQuery.PHONE_PHOTO_ID)); @@ -758,7 +768,7 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper { * update time. */ final Cursor updatedContactCursor = mContext.getContentResolver().query(PhoneQuery.URI, - PhoneQuery.PROJECTION, PhoneQuery.SELECT_UPDATED_CLAUSE, + PhoneQuery.PROJECTION, PhoneQuery.SELECTION, new String[]{lastUpdateMillis}, null); /** Sets the time after querying the database as the current update time. */ |