diff options
| author | Fred Quintana <fredq@google.com> | 2009-08-15 21:45:26 -0700 |
|---|---|---|
| committer | Fred Quintana <fredq@google.com> | 2009-08-15 22:40:25 -0700 |
| commit | ffd0cb04f97e62d286d185c520580d81a9c328b1 (patch) | |
| tree | d864589d0cfa54abc971091b172d1497cb79adcb /packages/SubscribedFeedsProvider | |
| parent | fa2944d93f4c5050fb4a99d90006791c2995b31c (diff) | |
| download | frameworks_base-ffd0cb04f97e62d286d185c520580d81a9c328b1.zip frameworks_base-ffd0cb04f97e62d286d185c520580d81a9c328b1.tar.gz frameworks_base-ffd0cb04f97e62d286d185c520580d81a9c328b1.tar.bz2 | |
do not merge: cherrypicked 3710f390968e683a0ad3adf0b517dfcade3564ce from master branch
Diffstat (limited to 'packages/SubscribedFeedsProvider')
| -rw-r--r-- | packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsIntentService.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsIntentService.java b/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsIntentService.java index 3cd2cc4..b854f86 100644 --- a/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsIntentService.java +++ b/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsIntentService.java @@ -113,7 +113,7 @@ public class SubscribedFeedsIntentService extends IntentService { // TODO(fredq) fix the hardcoded type final Account account = new Account(accountName, "com.google.GAIA"); c = context.getContentResolver().query(SubscribedFeeds.Feeds.CONTENT_URI, - null, where, new String[]{account.mName, account.mType, feed}, null); + null, where, new String[]{account.name, account.type, feed}, null); if (c.getCount() == 0) { Log.w(TAG, "received tickle for non-existent feed: " + "account " + accountName + ", feed " + feed); @@ -171,12 +171,12 @@ public class SubscribedFeedsIntentService extends IntentService { try { ContentValues values = new ContentValues(); for (Account account : accounts) { - values.put(SyncConstValue._SYNC_ACCOUNT, account.mName); - values.put(SyncConstValue._SYNC_ACCOUNT_TYPE, account.mType); + values.put(SyncConstValue._SYNC_ACCOUNT, account.name); + values.put(SyncConstValue._SYNC_ACCOUNT_TYPE, account.type); contentResolver.update(SubscribedFeeds.Feeds.CONTENT_URI, values, SubscribedFeeds.Feeds._SYNC_ACCOUNT + "=? AND " + SubscribedFeeds.Feeds._SYNC_ACCOUNT_TYPE + "=?", - new String[] {account.mName, account.mType}); + new String[] {account.name, account.type}); } } catch (SQLiteFullException e) { Log.w(TAG, "disk full while trying to mark the feeds as dirty, skipping"); |