summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-05-20 12:18:29 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-05-20 12:18:29 -0700
commit6b961bb54bfb44abd1bcee46924ca38c2d10dd72 (patch)
tree4612dd001c240ff3021766bc9c076f0ec7e0a277
parentbad962bf407bbb7a7ce296fb75f1883375afa832 (diff)
parent075a4f8951ec22458c7d71a578a73c487d01afb9 (diff)
downloadframeworks_base-6b961bb54bfb44abd1bcee46924ca38c2d10dd72.zip
frameworks_base-6b961bb54bfb44abd1bcee46924ca38c2d10dd72.tar.gz
frameworks_base-6b961bb54bfb44abd1bcee46924ca38c2d10dd72.tar.bz2
Merge change 2090
* changes: Fix bug #1863517: use the new signature for data message token in SubscribedFeedsIntentService.
-rw-r--r--packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsIntentService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsIntentService.java b/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsIntentService.java
index 2326b46..9992420 100644
--- a/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsIntentService.java
+++ b/packages/SubscribedFeedsProvider/src/com/android/providers/subscribedfeeds/SubscribedFeedsIntentService.java
@@ -60,7 +60,7 @@ public class SubscribedFeedsIntentService extends IntentService {
"android.intent.extra.from_trusted_server", false);
if (fromTrustedServer) {
String accountName = intent.getStringExtra("account");
- String token = intent.getStringExtra("message_token");
+ String token = intent.getStringExtra(Intent.EXTRA_REMOTE_INTENT_TOKEN);
if (TextUtils.isEmpty(accountName) || TextUtils.isEmpty(token)) {
if (Config.LOGD) {