summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmccormick <kmccormick@google.com>2014-10-01 22:36:57 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-01 22:36:57 +0000
commitec1aa9f38eee7b7aae6da00957ba684bfa469b5e (patch)
tree02471dd9054e4ea43d5c9cfa7474730e9fdc3aa6
parentc7d8e8bd5fdb3733c8a934d0f12631bc8ea9a513 (diff)
parent04e50c474ce5b6aa2e366bc057a29a16467a66bd (diff)
downloadframeworks_base-ec1aa9f38eee7b7aae6da00957ba684bfa469b5e.zip
frameworks_base-ec1aa9f38eee7b7aae6da00957ba684bfa469b5e.tar.gz
frameworks_base-ec1aa9f38eee7b7aae6da00957ba684bfa469b5e.tar.bz2
am 04e50c47: am d1ba4c13: am ae3bd63b: am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
* commit '04e50c474ce5b6aa2e366bc057a29a16467a66bd': Doc update: Update preprod (staging) instructions.
-rw-r--r--docs/html/google/gcm/ccs.jd12
1 files changed, 8 insertions, 4 deletions
diff --git a/docs/html/google/gcm/ccs.jd b/docs/html/google/gcm/ccs.jd
index 1c7c802..2faf97f 100644
--- a/docs/html/google/gcm/ccs.jd
+++ b/docs/html/google/gcm/ccs.jd
@@ -81,10 +81,14 @@ Java sample using the Smack library</a>.</p>
<p>The CCS XMPP endpoint runs at {@code gcm.googleapis.com:5235}. When testing
functionality (with non-production users), you should instead connect to
-{@code gcm-staging.googleapis.com:5236} (note the different port). Testing on
-staging (a smaller environment where the latest CCS builds run) is beneficial
-both for isolating real users from test code, as well as for early detection of
-unexpected behavior changes.</p>
+{@code gcm-preprod.googleapis.com:5236} (note the different port). Regular
+testing on preprod (a smaller environment where the latest CCS builds run) is
+beneficial both for isolating real users from test code, as well as for early
+detection of unexpected behavior changes. Note that a connection receives upstream
+messages destined for its GCM sender ID, regardless of which environment (gcm or
+gcm-preprod) it is connected to. Therefore, test code connecting to
+{@code gcm-preprod.googleapis.com:5236} should use a different GCM sender ID to
+avoid upstream messages from production traffic being sent over test connections.</p>
<p>The connection has two important requirements:</p>