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

Merge "Lock cache puts while running tests"

Browse Source
This commit is contained in:
Todd Kennedy 2011-06-08 13:01:39 -07:00 committed by Android (Google) Code Review
commit 3161f1a3f2
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,6 +105,8 @@ public final class ContentCache {
private final String mLogTag; private final String mLogTag;
// Cache statistics // Cache statistics
private final Statistics mStats; private final Statistics mStats;
/** If {@code true}, lock the cache for all writes */
private static boolean sLockCache;
/** /**
* A synchronized reference counter for arbitrary objects * A synchronized reference counter for arbitrary objects
@ -465,7 +467,7 @@ public final class ContentCache {
mStats.mStaleCount++; mStats.mStaleCount++;
return c; return c;
} }
if (c != null && projection == mBaseProjection) { if (c != null && projection == mBaseProjection && !sLockCache) {
if (Email.DEBUG && DEBUG_CACHE) { if (Email.DEBUG && DEBUG_CACHE) {
Log.d(mLogTag, "============ Caching cursor for: " + id); Log.d(mLogTag, "============ Caching cursor for: " + id);
} }
@ -611,7 +613,7 @@ public final class ContentCache {
if (Email.DEBUG && DEBUG_CACHE) { if (Email.DEBUG && DEBUG_CACHE) {
Log.d(mLogTag, "=========== Unlocking cache for: " + id); Log.d(mLogTag, "=========== Unlocking cache for: " + id);
} }
if (values != null) { if (values != null && !sLockCache) {
MatrixCursor cursor = getMatrixCursor(id, mBaseProjection, values); MatrixCursor cursor = getMatrixCursor(id, mBaseProjection, values);
if (cursor != null) { if (cursor != null) {
if (Email.DEBUG && DEBUG_CACHE) { if (Email.DEBUG && DEBUG_CACHE) {
@ -727,6 +729,14 @@ public final class ContentCache {
} }
} }
/** Sets the cache lock. If the lock is {@code true}, also invalidates all cached items. */
public static void setLockCacheForTest(boolean lock) {
sLockCache = lock;
if (sLockCache) {
invalidateAllCachesForTest();
}
}
static class Statistics { static class Statistics {
private final ContentCache mCache; private final ContentCache mCache;
private final String mName; private final String mName;