summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmccormick@google.com <kmccormick@google.com>2012-11-12 15:05:58 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-12 15:05:58 -0800
commit422b19592fae7bf00b91af62b021fd1e7ba9c031 (patch)
tree8d6b229c42cce475d5f2e73e79447c274885db04
parentfabcff5c46f93ffd7177669b5174ec4249469185 (diff)
parent76b1be8b78bbb1bdfaf78a848c20b77cb7b0dedf (diff)
downloadframeworks_base-422b19592fae7bf00b91af62b021fd1e7ba9c031.zip
frameworks_base-422b19592fae7bf00b91af62b021fd1e7ba9c031.tar.gz
frameworks_base-422b19592fae7bf00b91af62b021fd1e7ba9c031.tar.bz2
am 76b1be8b: am 39cc8f80: am 4233c939: Merge "Doc Update: param name change" into jb-dev-docs
* commit '76b1be8b78bbb1bdfaf78a848c20b77cb7b0dedf': Doc Update: param name change
-rw-r--r--docs/html/guide/google/gcm/gcm.jd12
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/html/guide/google/gcm/gcm.jd b/docs/html/guide/google/gcm/gcm.jd
index edf285c..a402e8e 100644
--- a/docs/html/guide/google/gcm/gcm.jd
+++ b/docs/html/guide/google/gcm/gcm.jd
@@ -676,8 +676,8 @@ sent. Optional. The default value is <code>false</code>, and must be a JSON bool
<td>How long (in seconds) the message should be kept on GCM storage if the device is offline. Optional (default time-to-live is 4 weeks, and must be set as a JSON number).</td>
</tr>
<tr>
- <td><code>category</code></td>
- <td>A string containing the package name of your application. When set, messages will only be sent to registration IDs that match the category. Optional.
+ <td><code>restricted_package_name</code></td>
+ <td>A string containing the package name of your application. When set, messages will only be sent to registration IDs that match the package name. Optional.
</td>
</tr>
<tr>
@@ -717,7 +717,7 @@ sent. Optional. The default value is <code>false</code>, and must be a JSON bool
<td>Same as JSON (see previous table). Optional.</td>
</tr>
<tr>
- <td><code>category</code></td>
+ <td><code>restricted_package_name</code></td>
<td>Same as JSON (see previous table). Optional.
</td>
</tr>
@@ -964,11 +964,11 @@ Happens when the HTTP status code is 500, or when the <code>error</code> field o
object in the results array is <code>InternalServerError</code>.
</dd>
-<dt id="invalid_category"><strong>Invalid Category</strong></dt>
+<dt id="restricted_package_name"><strong>Invalid Package Name</strong></dt>
<dd>
-A message was addressed to a registration ID whose category did not match the value passed in the request. Happens when error code is
-<code>InvalidCategory</code>.
+A message was addressed to a registration ID whose package name did not match the value passed in the request. Happens when error code is
+<code>InvalidPackageName</code>.
</dd>