Merge "MTP host: Use Java longs for storage and object IDs" (5a08b50e) · Commits · e / os / android_frameworks_base

core/java/android/provider/Mtp.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ public final class Mtp
		return Uri.parse(CONTENT_AUTHORITY_DEVICE_SLASH + deviceID + "/storage");
		}

		public static Uri getContentUri(int deviceID, int storageID) {
		public static Uri getContentUri(int deviceID, long storageID) {
		return Uri.parse(CONTENT_AUTHORITY_DEVICE_SLASH + deviceID + "/storage/" + storageID);
		}

		@@ -97,17 +97,17 @@ public final class Mtp
		*/
		public static final class Object implements BaseColumns {

		public static Uri getContentUri(int deviceID, int objectID) {
		public static Uri getContentUri(int deviceID, long objectID) {
		return Uri.parse(CONTENT_AUTHORITY_DEVICE_SLASH + deviceID
		+ "/object/" + objectID);
		}

		public static Uri getContentUriForObjectChildren(int deviceID, int objectID) {
		public static Uri getContentUriForObjectChildren(int deviceID, long objectID) {
		return Uri.parse(CONTENT_AUTHORITY_DEVICE_SLASH + deviceID
		+ "/object/" + objectID + "/child");
		}

		public static Uri getContentUriForStorageChildren(int deviceID, int storageID) {
		public static Uri getContentUriForStorageChildren(int deviceID, long storageID) {
		return Uri.parse(CONTENT_AUTHORITY_DEVICE_SLASH + deviceID
		+ "/storage/" + storageID + "/child");
		}

media/java/android/media/MtpClient.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -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);
		}

media/java/android/media/MtpCursor.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -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);

media/jni/android_media_MtpClient.cpp

+10 −10

Original line number	Diff line number	Diff line
		@@ -161,7 +161,7 @@ android_media_MtpClient_stop(JNIEnv *env, jobject thiz)

		static jboolean
		android_media_MtpClient_delete_object(JNIEnv *env, jobject thiz,
		jint device_id, jint object_id)
		jint device_id, jlong object_id)
		{
		#ifdef HAVE_ANDROID_OS
		MyClient client = (MyClient )env->GetIntField(thiz, field_context);
		@@ -173,9 +173,9 @@ android_media_MtpClient_delete_object(JNIEnv *env, jobject thiz,
		return NULL;
		}

		static jint
		static jlong
		android_media_MtpClient_get_parent(JNIEnv *env, jobject thiz,
		jint device_id, jint object_id)
		jint device_id, jlong object_id)
		{
		#ifdef HAVE_ANDROID_OS
		MyClient client = (MyClient )env->GetIntField(thiz, field_context);
		@@ -187,9 +187,9 @@ android_media_MtpClient_get_parent(JNIEnv *env, jobject thiz,
		return -1;
		}

		static jint
		static jlong
		android_media_MtpClient_get_storage_id(JNIEnv *env, jobject thiz,
		jint device_id, jint object_id)
		jint device_id, jlong object_id)
		{
		#ifdef HAVE_ANDROID_OS
		MyClient client = (MyClient )env->GetIntField(thiz, field_context);
		@@ -203,7 +203,7 @@ android_media_MtpClient_get_storage_id(JNIEnv *env, jobject thiz,

		static jobject
		android_media_MtpClient_open_file(JNIEnv *env, jobject thiz,
		jint device_id, jint object_id)
		jint device_id, jlong object_id)
		{
		#ifdef HAVE_ANDROID_OS
		MyClient client = (MyClient )env->GetIntField(thiz, field_context);
		@@ -240,10 +240,10 @@ static JNINativeMethod gMethods[] = {
		{"native_finalize", "()V", (void *)android_media_MtpClient_finalize},
		{"native_start", "()Z", (void *)android_media_MtpClient_start},
		{"native_stop", "()V", (void *)android_media_MtpClient_stop},
		{"native_delete_object", "(II)Z", (void *)android_media_MtpClient_delete_object},
		{"native_get_parent", "(II)I", (void *)android_media_MtpClient_get_parent},
		{"native_get_storage_id", "(II)I", (void *)android_media_MtpClient_get_storage_id},
		{"native_open_file", "(II)Landroid/os/ParcelFileDescriptor;",
		{"native_delete_object", "(IJ)Z", (void *)android_media_MtpClient_delete_object},
		{"native_get_parent", "(IJ)J", (void *)android_media_MtpClient_get_parent},
		{"native_get_storage_id", "(IJ)J", (void *)android_media_MtpClient_get_storage_id},
		{"native_open_file", "(IJ)Landroid/os/ParcelFileDescriptor;",
		(void *)android_media_MtpClient_open_file},
		};

media/jni/android_media_MtpCursor.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ static bool ExceptionCheck(void* env)

		static void
		android_media_MtpCursor_setup(JNIEnv *env, jobject thiz, jobject javaClient,
		jint queryType, jint deviceID, jint storageID, jint objectID, jintArray javaColumns)
		jint queryType, jint deviceID, jlong storageID, jlong objectID, jintArray javaColumns)
		{
		#ifdef HAVE_ANDROID_OS
		LOGD("android_media_MtpCursor_setup queryType: %d deviceID: %d storageID: %d objectID: %d\n",
		@@ -104,7 +104,7 @@ android_media_MtpCursor_fill_window(JNIEnv *env, jobject thiz, jobject javaWindo
		// ----------------------------------------------------------------------------

		static JNINativeMethod gMethods[] = {
		{"native_setup", "(Landroid/media/MtpClient;IIII[I)V",
		{"native_setup", "(Landroid/media/MtpClient;IIJJ[I)V",
		(void *)android_media_MtpCursor_setup},
		{"native_finalize", "()V", (void *)android_media_MtpCursor_finalize},
		{"native_fill_window", "(Landroid/database/CursorWindow;I)I",