diff options
| author | kmccormick <kmccormick@google.com> | 2013-04-22 13:15:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-22 13:15:23 -0700 |
| commit | f9a152d8fbf012f990afe02a4ef3d528853ca30b (patch) | |
| tree | eb47f9494df49cea57938c67c759f99f483295f6 /docs/html/google | |
| parent | 8841569fc835bb172e06dc3fba9597c643af8b31 (diff) | |
| parent | 0415ea6ad9a42837339ec5afc43f3defabe58e38 (diff) | |
| download | frameworks_base-f9a152d8fbf012f990afe02a4ef3d528853ca30b.zip frameworks_base-f9a152d8fbf012f990afe02a4ef3d528853ca30b.tar.gz frameworks_base-f9a152d8fbf012f990afe02a4ef3d528853ca30b.tar.bz2 | |
am 0415ea6a: am 2aca8dbe: am b116885c: am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs
* commit '0415ea6ad9a42837339ec5afc43f3defabe58e38':
Doc update: Fix firewall text.
Diffstat (limited to 'docs/html/google')
| -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> |