diff options
| author | Costin Manolache <costin@google.com> | 2009-09-29 22:58:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-29 22:58:53 -0700 |
| commit | 264f9b4530d6ecbd9e9d02cf5c61c7b19f4c6376 (patch) | |
| tree | b717af1949faca40739282bb18d2df17d8fd0a18 /packages | |
| parent | 90183823b00ad5ce04948cf03d827a47c82ca445 (diff) | |
| parent | 3348f14b3d46b172a5b557f81aac526b7e8bf5fb (diff) | |
| download | frameworks_base-264f9b4530d6ecbd9e9d02cf5c61c7b19f4c6376.zip frameworks_base-264f9b4530d6ecbd9e9d02cf5c61c7b19f4c6376.tar.gz frameworks_base-264f9b4530d6ecbd9e9d02cf5c61c7b19f4c6376.tar.bz2 | |
am 3348f14b: Remove GAIA string
Merge commit '3348f14b3d46b172a5b557f81aac526b7e8bf5fb' into eclair-plus-aosp
* commit '3348f14b3d46b172a5b557f81aac526b7e8bf5fb':
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); } } |