diff options
author | Makoto Onuki <omakoto@google.com> | 2012-03-28 09:58:18 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-28 09:58:18 -0700 |
commit | c65c6bd3a52ece11a7ed60c20d6bf4c000bd70c7 (patch) | |
tree | b6d2dfc79a42e2219ec50893ab18e55f87d11009 /src/com/android/providers | |
parent | c624ff13d5df4848a6ec605e25ea8469dd677d5d (diff) | |
download | packages_providers_ContactsProvider-c65c6bd3a52ece11a7ed60c20d6bf4c000bd70c7.zip packages_providers_ContactsProvider-c65c6bd3a52ece11a7ed60c20d6bf4c000bd70c7.tar.gz packages_providers_ContactsProvider-c65c6bd3a52ece11a7ed60c20d6bf4c000bd70c7.tar.bz2 |
Revert ""Rollback" mimetype cache"
This reverts commit c624ff13d5df4848a6ec605e25ea8469dd677d5d
Due to b/6123232
Diffstat (limited to 'src/com/android/providers')
3 files changed, 4 insertions, 51 deletions
diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java index a476ee7..32928ba 100644 --- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java +++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java @@ -700,16 +700,12 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { } /** In-memory cache of previously found MIME-type mappings */ + // TODO Use ConcurrentHashMap? private final HashMap<String, Long> mMimetypeCache = new HashMap<String, Long>(); - - /** TODO Remove it */ + /** In-memory cache of previously found package name mappings */ + // TODO Use ConcurrentHashMap? private final HashMap<String, Long> mPackageCache = new HashMap<String, Long>(); - /** - * The last known maximum mimetype ID when the current transaction started. Used to - * "Rollback" {@link #mMimetypeCache}. - */ - private long mMaxMimeTypeIdAtTransactionStart; private long mMimeTypeIdEmail; private long mMimeTypeIdIm; private long mMimeTypeIdNickname; @@ -4126,42 +4122,6 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { } } - private long getBiggestCachedMimetypeId() { - long max = -1; - for (long id : mMimetypeCache.values()) { - if (id > max) max = id; - } - return max; - } - - public void onBeginTransaction() { - if (Log.isLoggable(TAG, Log.VERBOSE)) { - Log.v(TAG, "onBeginTransaction: [" + getClass().getSimpleName() + "]"); - } - mMaxMimeTypeIdAtTransactionStart = getBiggestCachedMimetypeId(); - } - - public void onCommitTransaction() { - if (Log.isLoggable(TAG, Log.VERBOSE)) { - Log.v(TAG, "onCommitTransaction: [" + getClass().getSimpleName() + "]"); - } - } - - public void onRollbackTransaction() { - Log.w(TAG, "onRollbackTransaction: [" + getClass().getSimpleName() + "]"); - - final Set<String> mimetypesToRemove = Sets.newHashSet(); - for (String mimetype : mMimetypeCache.keySet()) { - if (mMimetypeCache.get(mimetype) > mMaxMimeTypeIdAtTransactionStart) { - mimetypesToRemove.add(mimetype); - } - } - - for (String mimetype : mimetypesToRemove) { - mMimetypeCache.remove(mimetype); - } - } - /** * Gets all accounts in the accounts table. */ diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java index 33eeb80..6de16df 100644 --- a/src/com/android/providers/contacts/ContactsProvider2.java +++ b/src/com/android/providers/contacts/ContactsProvider2.java @@ -2125,7 +2125,6 @@ public class ContactsProvider2 extends AbstractContactsProvider mContactAggregator.clearPendingAggregations(); mContactTransactionContext.clear(); } - mDbHelper.get().onBeginTransaction(); } @Override @@ -2149,15 +2148,11 @@ public class ContactsProvider2 extends AbstractContactsProvider updateProviderStatus(); mProviderStatusUpdateNeeded = false; } - mDbHelper.get().onCommitTransaction(); } @Override public void onRollback() { - if (VERBOSE_LOGGING) { - Log.v(TAG, "onRollback"); - } - mDbHelper.get().onRollbackTransaction(); + // Not used. } private void updateSearchIndexInTransaction() { diff --git a/src/com/android/providers/contacts/ProfileProvider.java b/src/com/android/providers/contacts/ProfileProvider.java index 360909f..8aa653d 100644 --- a/src/com/android/providers/contacts/ProfileProvider.java +++ b/src/com/android/providers/contacts/ProfileProvider.java @@ -140,13 +140,11 @@ public class ProfileProvider extends AbstractContactsProvider { return mDelegate.getLocale(); } - @Override public void onBegin() { mDelegate.switchToProfileMode(); mDelegate.onBegin(); } - @Override public void onCommit() { mDelegate.switchToProfileMode(); mDelegate.onCommit(); |