commit a24e518dd85c6c5935c44eff10a286fb96378167
author Andrew Solovay <asolovay@google.com> Sat Aug 22 00:59:08 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Aug 22 00:59:08 2015 +0000
tree da2e06ec46196feeafe38226da5b0f56f59754de
parent cf620038f4af0fec5980fd9ef8e9234cfaf7670c
parent 906cc3f4a1f99798de5be86a7c5235cdcd801f27

am 906cc3f4: am 3f233293: am e2ca8593: am 9520071b: Merge "docs: Fix return info for support lib checkSelfPermission()" into mnc-dev

* commit '906cc3f4a1f99798de5be86a7c5235cdcd801f27':
  docs: Fix return info for support lib checkSelfPermission()

docs/html/preview/features/runtime-permissions.jd

diff --git a/docs/html/preview/features/runtime-permissions.jd b/docs/html/preview/features/runtime-permissions.jd
index 8ab7619..62e49b9 100644
--- a/docs/html/preview/features/runtime-permissions.jd
+++ b/docs/html/preview/features/runtime-permissions.jd
@@ -916,8 +916,11 @@
   </dt>
 
   <dd>
-    Returns <code>true</code> if the app has the specified permission, whether
-    or not the device is using the M Preview.
+    Returns {@link android.content.pm.PackageManager#PERMISSION_GRANTED
+    PERMISSION_GRANTED} if the app has the specified permission, whether
+    or not the device is using the M Preview. If the app does not have the
+    specified permission, returns {@link
+    android.content.pm.PackageManager#PERMISSION_DENIED PERMISSION_DENIED}.
   </dd>
 
   <dt>