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

am cc033bd3: Merge "Fix some bugs in SettingsProvider that I introduced the other day." into gingerbread

Browse Source 
Merge commit 'cc033bd367a445d5e3f8de919cd155505b25274c' into gingerbread-plus-aosp

* commit 'cc033bd367a445d5e3f8de919cd155505b25274c':
  Fix some bugs in SettingsProvider that I introduced the other day.
This commit is contained in:
Brad Fitzpatrick
2010-08-26 17:58:04 -07:00
committed by Android Git Automerger
parent aed5d62ac1 cc033bd367
commit 603a1f5970
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -311,7 +311,7 @@ public class SettingsProvider extends ContentProvider {
cache.setFullyMatchesDisk(false);
Log.d(TAG, "row count exceeds max cache entries for table " + table);
}
Log.d(TAG, "cache for settings table '" + table + "' fullycached=" +
Log.d(TAG, "cache for settings table '" + table + "' rows=" + rows + "; fullycached=" +
cache.fullyMatchesDisk());
}
} finally {
@@ -598,7 +598,7 @@ public class SettingsProvider extends ContentProvider {
int count = db.delete(args.table, args.where, args.args);
sKnownMutationsInFlight.decrementAndGet();
if (count > 0) {
SettingsCache.wipe(args.table); // before we notify
SettingsCache.invalidate(args.table); // before we notify
sendNotify(url);
}
startAsyncCachePopulation();
@@ -616,10 +616,10 @@ public class SettingsProvider extends ContentProvider {
sKnownMutationsInFlight.incrementAndGet();
SQLiteDatabase db = mOpenHelper.getWritableDatabase();
sKnownMutationsInFlight.decrementAndGet();
int count = db.update(args.table, initialValues, args.where, args.args);
sKnownMutationsInFlight.decrementAndGet();
if (count > 0) {
SettingsCache.wipe(args.table); // before we notify
SettingsCache.invalidate(args.table); // before we notify
sendNotify(url);
}
startAsyncCachePopulation();
@@ -828,14 +828,14 @@ public class SettingsProvider extends ContentProvider {
* Used for wiping a whole cache on deletes when we're not
* sure what exactly was deleted or changed.
*/
public static void wipe(String tableName) {
public static void invalidate(String tableName) {
SettingsCache cache = SettingsCache.forTable(tableName);
if (cache == null) {
return;
}
synchronized (cache) {
cache.clear();
cache.mCacheFullyMatchesDisk = true;
cache.mCacheFullyMatchesDisk = false;
}
}