ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix deadlock in ContentCache"

Browse Source
This commit is contained in:
Marc Blank 2010-11-23 11:51:04 -08:00 committed by Android (Google) Code Review
commit 70188b71aa
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/email/provider/ContentCache.java
View File

@ -277,8 +277,6 @@ public final class ContentCache extends LinkedHashMap<String, Cursor> {
public CachedCursor(Cursor cursor, ContentCache cache, String name) { public CachedCursor(Cursor cursor, ContentCache cache, String name) {
super(cursor); super(cursor);
// The underlying cursor must always be at position 0
cursor.moveToPosition(0);
mCursor = cursor; mCursor = cursor;
mCache = cache; mCache = cache;
// Add this to our set of active cursors // Add this to our set of active cursors
@ -445,7 +443,15 @@ public final class ContentCache extends LinkedHashMap<String, Cursor> {
* @param projection the projection represented by the cursor * @param projection the projection represented by the cursor
* @return whether or not the cursor was cached * @return whether or not the cursor was cached
*/ */
public synchronized Cursor putCursor(Cursor c, String id, String[] projection, public Cursor putCursor(Cursor c, String id, String[] projection, CacheToken token) {
// Make sure the underlying cursor is at the first row, and do this without synchronizing,
// to prevent deadlock with a writing thread (which might, for example, be calling into
// CachedCursor.invalidate)
c.moveToPosition(0);
return putCursorImpl(c, id, projection, token);
}
public synchronized Cursor putCursorImpl(Cursor c, String id, String[] projection,
CacheToken token) { CacheToken token) {
try { try {
if (!token.isValid()) { if (!token.isValid()) {
@ -465,7 +471,6 @@ public final class ContentCache extends LinkedHashMap<String, Cursor> {
unlockImpl(id, null, false); unlockImpl(id, null, false);
} }
put(id, c); put(id, c);
c.moveToFirst();
return new CachedCursor(c, this, id); return new CachedCursor(c, this, id);
} }
return c; return c;