am 3b0afcaa: am d126d724: Merge "bug:3339065 enable sqlite concurrency enhancing feature on settingsprovider" into honeycomb

* commit '3b0afcaacfa6c08f16c8dd48e5432dd71a0a064f':
  bug:3339065 enable sqlite concurrency enhancing feature on settingsprovider
This commit is contained in:
Vasu Nori
2011-01-11 12:34:37 -08:00
committed by Android Git Automerger

View File

@@ -262,11 +262,8 @@ public class SettingsProvider extends ContentProvider {
// Watch for external modifications to the database file,
// keeping our cache in sync.
// It's kinda lame to call mOpenHelper.getReadableDatabase()
// during onCreate(), but since ensureAndroidIdIsSet has
// already done it above and initialized/upgraded the
// database, might as well just use it...
SQLiteDatabase db = mOpenHelper.getReadableDatabase();
SQLiteDatabase db = mOpenHelper.getWritableDatabase();
db.enableWriteAheadLogging();
sObserverInstance = new SettingsFileObserver(db.getPath());
sObserverInstance.startWatching();
startAsyncCachePopulation();