diff options
| author | Costin Manolache <costin@google.com> | 2009-10-01 11:51:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-01 11:51:16 -0700 |
| commit | d153ea28e0bfbc5f576a200eb432fbeb8dc85bfe (patch) | |
| tree | bb7dcf3c8e5990ba20a6a2c3e0ad6a0816d8ce5d /packages | |
| parent | a8b2d463b8f34c6a77b702ca73a30b9b634fdd3c (diff) | |
| parent | 264f9b4530d6ecbd9e9d02cf5c61c7b19f4c6376 (diff) | |
| download | frameworks_base-d153ea28e0bfbc5f576a200eb432fbeb8dc85bfe.zip frameworks_base-d153ea28e0bfbc5f576a200eb432fbeb8dc85bfe.tar.gz frameworks_base-d153ea28e0bfbc5f576a200eb432fbeb8dc85bfe.tar.bz2 | |
am 264f9b45: am 3348f14b: Remove GAIA string
Merge commit '264f9b4530d6ecbd9e9d02cf5c61c7b19f4c6376'
* commit '264f9b4530d6ecbd9e9d02cf5c61c7b19f4c6376':
Remove GAIA string
Diffstat (limited to 'packages')
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsIntentService.java b/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsIntentService.java index b854f86..2e910b7 100644 --- a/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsIntentService.java +++ b/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsIntentService.java @@ -111,7 +111,7 @@ public class SubscribedFeedsIntentService extends IntentService { + "and " + SubscribedFeeds.Feeds.FEED + "= ?"; try { // TODO(fredq) fix the hardcoded type - final Account account = new Account(accountName, "com.google.GAIA"); + final Account account = new Account(accountName, "com.google"); c = context.getContentResolver().query(SubscribedFeeds.Feeds.CONTENT_URI, null, where, new String[]{account.name, account.type, feed}, null); if (c.getCount() == 0) { diff --git a/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsProvider.java b/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsProvider.java index 2647752..8585082 100644 --- a/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsProvider.java +++ b/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsProvider.java @@ -127,7 +127,7 @@ public class SubscribedFeedsProvider extends AbstractSyncableContentProvider { protected void onAccountsChanged(Account[] accountsArray) { super.onAccountsChanged(accountsArray); for (Account account : accountsArray) { - if (account.type.equals("com.google.GAIA")) { + if (account.type.equals("com.google")) { ContentResolver.setSyncAutomatically(account, "subscribedfeeds", true); } } |