Merge "MTP host: Use Java longs for storage and object IDs"

2 files changed, 12 insertions, 12 deletions

diff --git a/media/java/android/media/MtpClient.java b/media/java/android/media/MtpClient.java
index f7c0ce2..98da1f6 100644
--- a/media/java/android/media/MtpClient.java
+++ b/media/java/android/media/MtpClient.java
@@ -57,20 +57,20 @@ public class MtpClient {
         native_stop();
     }
 
-    public boolean deleteObject(int deviceID, int objectID) {
+    public boolean deleteObject(int deviceID, long objectID) {
         return native_delete_object(deviceID, objectID);
     }
 
-    public int getParent(int deviceID, int objectID) {
+    public long getParent(int deviceID, long objectID) {
         return native_get_parent(deviceID, objectID);
     }
 
-    public int getStorageID(int deviceID, int objectID) {
+    public long getStorageID(int deviceID, long objectID) {
         return native_get_storage_id(deviceID, objectID);
     }
 
     // create a file descriptor for reading the contents of an object over MTP
-    public ParcelFileDescriptor openFile(int deviceID, int objectID) {
+    public ParcelFileDescriptor openFile(int deviceID, long objectID) {
         return native_open_file(deviceID, objectID);
     }
 
@@ -101,8 +101,8 @@ public class MtpClient {
     private native final void native_finalize();
     private native boolean native_start();
     private native void native_stop();
-    private native boolean native_delete_object(int deviceID, int objectID);
-    private native int native_get_parent(int deviceID, int objectID);
-    private native int native_get_storage_id(int deviceID, int objectID);
-    private native ParcelFileDescriptor native_open_file(int deviceID, int objectID);
+    private native boolean native_delete_object(int deviceID, long objectID);
+    private native long native_get_parent(int deviceID, long objectID);
+    private native long native_get_storage_id(int deviceID, long objectID);
+    private native ParcelFileDescriptor native_open_file(int deviceID, long objectID);
 }
diff --git a/media/java/android/media/MtpCursor.java b/media/java/android/media/MtpCursor.java
index d4142d8..b9dd03e 100644
--- a/media/java/android/media/MtpCursor.java
+++ b/media/java/android/media/MtpCursor.java
@@ -43,8 +43,8 @@ public final class MtpCursor extends AbstractWindowedCursor {
 
     private int mQueryType;
     private int mDeviceID;
-    private int mStorageID;
-    private int mQbjectID;
+    private long mStorageID;
+    private long mQbjectID;
 
     /** The names of the columns in the projection */
     private String[] mColumns;
@@ -54,7 +54,7 @@ public final class MtpCursor extends AbstractWindowedCursor {
 
     private final MtpClient mClient;
 
-    public MtpCursor(MtpClient client, int queryType, int deviceID, int storageID, int objectID,
+    public MtpCursor(MtpClient client, int queryType, int deviceID, long storageID, long objectID,
             String[] projection) {
 
         mClient = client;
@@ -220,7 +220,7 @@ public final class MtpCursor extends AbstractWindowedCursor {
     private int mNativeContext;
 
     private native final void native_setup(MtpClient client, int queryType,
-            int deviceID, int storageID, int objectID, int[] columns);
+            int deviceID, long storageID, long objectID, int[] columns);
     private native final void native_finalize();
     private native void native_wait_for_event();
     private native int native_fill_window(CursorWindow window, int startPos);