summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Daichi Hirono <hirono@google.com> 2015-06-16 01:38:31 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-06-16 01:38:31 +0000
commit4e3fb992b7e5b84dfd54552cba1890eeb0296e46 (patch)
tree19eb7512b7614959fe533e2f269f75543ead6ab4
parent5f6e00d809ae8b027ba84ccd9363742f1401e323 (diff)
parent100e1c9235720ac020a20009da8b85f64efd4c11 (diff)
am 100e1c92: Merge "Fix API doc of MtpDevice#getObjectHandles." into mnc-dev
* commit '100e1c9235720ac020a20009da8b85f64efd4c11': Fix API doc of MtpDevice#getObjectHandles.
-rw-r--r--media/java/android/mtp/MtpDevice.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/java/android/mtp/MtpDevice.java b/media/java/android/mtp/MtpDevice.java
index 72dcaa8409a9..a68361b305e1 100644
--- a/media/java/android/mtp/MtpDevice.java
+++ b/media/java/android/mtp/MtpDevice.java
@@ -132,7 +132,8 @@ public final class MtpDevice {
*
* @param storageId the storage unit to query
* @param format the format of the object to return, or zero for all formats
- * @param objectHandle the parent object to query, or zero for the storage root
+ * @param objectHandle the parent object to query, -1 for the storage root,
+ * or zero for all objects
* @return the object handles
*/
public int[] getObjectHandles(int storageId, int format, int objectHandle) {