diff options
| author | khushalsagar <khushalsagar@chromium.org> | 2015-08-21 07:42:00 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-21 14:42:44 +0000 |
| commit | 5eadc03de0462da97278d609c3923b8a0b0723fc (patch) | |
| tree | 371f76677619a079187767a5d5e33d8a37984a38 | |
| parent | 052892e8af1e66e0a226c1e3fd982f1a571bbd95 (diff) | |
| download | chromium_src-5eadc03de0462da97278d609c3923b8a0b0723fc.zip chromium_src-5eadc03de0462da97278d609c3923b8a0b0723fc.tar.gz chromium_src-5eadc03de0462da97278d609c3923b8a0b0723fc.tar.bz2 | |
Roll cacheinvalidation to add changes removed with client release 20150819
The changes made in: https://codereview.chromium.org/1247443002 were removed by the client release 20150819. Rolling the client release update with the changes included.
Review URL: https://codereview.chromium.org/1308533002
Cr-Commit-Position: refs/heads/master@{#344765}
| -rw-r--r-- | third_party/cacheinvalidation/README.chromium | 1 | ||||
| -rw-r--r-- | third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/contrib/MultiplexingGcmListener.java | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/third_party/cacheinvalidation/README.chromium b/third_party/cacheinvalidation/README.chromium index f12419c..bfe170c 100644 --- a/third_party/cacheinvalidation/README.chromium +++ b/third_party/cacheinvalidation/README.chromium @@ -15,3 +15,4 @@ but was merged into the Chromium repository at r342. 2015-07-21: merging client library version 20150720 2015-08-17: merging bug fixes for client library version 20150720 2015-08-19: merging client library version 20150819 +2015-08-20: merging additions to client library version 20150819 diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/contrib/MultiplexingGcmListener.java b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/contrib/MultiplexingGcmListener.java index 5fb24d1..321ae83 100644 --- a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/contrib/MultiplexingGcmListener.java +++ b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/contrib/MultiplexingGcmListener.java @@ -266,11 +266,7 @@ public class MultiplexingGcmListener extends GCMBaseIntentService { protected void onMessage(Context context, Intent intent) { Intent newIntent = new Intent(); newIntent.putExtra(Intents.EXTRA_OP_MESSAGE, true); - - // Copy the extra keys containing the message payload into the new Intent. - for (String extraKey : intent.getExtras().keySet()) { - newIntent.putExtra(extraKey, intent.getStringExtra(extraKey)); - } + newIntent.putExtras(intent); rebroadcast(newIntent); } |