summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaichi Hirono <hirono@google.com>2015-06-16 01:30:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-16 01:30:31 +0000
commit100e1c9235720ac020a20009da8b85f64efd4c11 (patch)
tree603e126471446d9596da5e7532bf354bdcd94331
parent2bfe96513884f0c4a4836a615a80e17a1ba30173 (diff)
parent660727c79ed5e39d0260428f3e2fa36ea66c8626 (diff)
downloadframeworks_base-100e1c9235720ac020a20009da8b85f64efd4c11.zip
frameworks_base-100e1c9235720ac020a20009da8b85f64efd4c11.tar.gz
frameworks_base-100e1c9235720ac020a20009da8b85f64efd4c11.tar.bz2
Merge "Fix API doc of MtpDevice#getObjectHandles." into mnc-dev
-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 72dcaa8..a68361b 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) {