diff options
author | kmccormick <kmccormick@google.com> | 2013-04-22 20:08:10 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-22 20:08:11 +0000 |
commit | ce534905a63f97766f487798fd61cb8414da04fe (patch) | |
tree | 69d4aca794549aab4240f069ea4812224146b231 | |
parent | 2779da87e2414709afe462339bb3cfde7feb2965 (diff) | |
parent | 91290d59d53c8f81155c395ae05ad017b0900553 (diff) | |
download | frameworks_base-ce534905a63f97766f487798fd61cb8414da04fe.zip frameworks_base-ce534905a63f97766f487798fd61cb8414da04fe.tar.gz frameworks_base-ce534905a63f97766f487798fd61cb8414da04fe.tar.bz2 |
Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
-rw-r--r-- | docs/html/google/gcm/gcm.jd | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/google/gcm/gcm.jd b/docs/html/google/gcm/gcm.jd index 26fc49a..ce28fb8 100644 --- a/docs/html/google/gcm/gcm.jd +++ b/docs/html/google/gcm/gcm.jd @@ -779,9 +779,9 @@ sent. Optional. The default value is <code>false</code>, and must be a JSON bool that restricts the traffic to or from the Internet, you need to configure it to allow connectivity with GCM in order for your Android devices to receive messages. -The ports to open are: 5228, 5229, and 5230. GCM typically only uses 5228, but -it sometimes uses 5229 and 5230. GCM doesn't provide specific IPs, so you should -allow your firewall to accept incoming connections from all IP addresses +The ports to open are: 5228, 5229, and 5230. GCM typically only uses 5228, but +it sometimes uses 5229 and 5230. GCM doesn't provide specific IPs, so you should allow +your firewall to accept outgoing connections to all IP addresses contained in the IP blocks listed in Google's ASN of 15169.</p> |