summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorRobert Ly <robertly@google.com>2013-02-05 23:17:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-02-05 23:17:36 +0000
commitd6e0c147175708bcc02813fc0f4008179e95b9e7 (patch)
treeeff06b11c72e69bc5923b83f5363624abdd49462 /docs
parent1247fbd43fc9d5492cb97d6313e851a6518ab4b8 (diff)
parent4efe071ed66c4ba34c3829afd44b43bcb6b51b7b (diff)
downloadframeworks_base-d6e0c147175708bcc02813fc0f4008179e95b9e7.zip
frameworks_base-d6e0c147175708bcc02813fc0f4008179e95b9e7.tar.gz
frameworks_base-d6e0c147175708bcc02813fc0f4008179e95b9e7.tar.bz2
Merge "docs: update auth doc to mention multiple scopes bug 7644251" into jb-mr1-dev
Diffstat (limited to 'docs')
-rw-r--r--docs/html/google/play-services/auth.jd8
1 files changed, 7 insertions, 1 deletions
diff --git a/docs/html/google/play-services/auth.jd b/docs/html/google/play-services/auth.jd
index 3f46c3f..8e11131 100644
--- a/docs/html/google/play-services/auth.jd
+++ b/docs/html/google/play-services/auth.jd
@@ -57,7 +57,12 @@ private String[] getAccountNames() {
</pre>
<h2 id="obtain">Obtaining an Access Token</h2>
<p>
- With an email address, you can now obtain an access token. There are two general
+ With an email address and the service scope you can now obtain an access token.
+</p>
+<p class="note"><strong>Note:</strong> Specify <code>"oauth2:<em>scope</em>"</code> for a single scope or
+ <code>"oauth2:<em>scope1</em> <em>scope2</em> <em>scope3</em>"</code> for multiple scopes.</p>
+
+There are two general
ways to get a token:</p>
<ul>
@@ -73,6 +78,7 @@ private String[] getAccountNames() {
<h3>Using getToken()</h3>
The following code snippet obtains an access token with an email address, the scope that you want to use for the service, and a {@link android.content.Context}:
+
<pre>
HelloActivity mActivity;
String mEmail;