Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "bug:3339065 enable sqlite concurrency enhancing feature on settingsprovider" into honeycomb

Browse Source
This commit is contained in:
Vasu Nori
2011-01-11 10:37:22 -08:00
committed by Android (Google) Code Review
parent cef295780a 01a479ccc4
commit d126d724f1
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

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