Rename MtpClient and MtpCursor to PtpClient and PtpCursor

Change-Id: I26fce3bf32c8e9c8d592106af7ab4c35b19e0996
Signed-off-by: Mike Lockwood <lockwood@android.com>

6 files changed, 63 insertions, 63 deletions

diff --git a/media/java/android/media/MtpClient.java b/media/java/android/media/PtpClient.java
index dcb1983..2e40635 100644
--- a/media/java/android/media/MtpClient.java
+++ b/media/java/android/media/PtpClient.java
@@ -21,9 +21,9 @@ import android.util.Log;
 /**
  * {@hide}
  */
-public class MtpClient {
+public class PtpClient {
 
-    private static final String TAG = "MtpClient";
+    private static final String TAG = "PtpClient";
 
     private final Listener mListener;
 
@@ -31,10 +31,10 @@ public class MtpClient {
         System.loadLibrary("media_jni");
     }
 
-    public MtpClient(Listener listener) {
+    public PtpClient(Listener listener) {
         native_setup();
         if (listener == null) {
-            throw new NullPointerException("MtpClient: listener is null");
+            throw new NullPointerException("PtpClient: listener is null");
         }
         mListener = listener;
     }
@@ -75,10 +75,10 @@ public class MtpClient {
     }
 
     public interface Listener {
-        // called when a new MTP device has been discovered
+        // called when a new PTP device has been discovered
         void deviceAdded(int id);
 
-        // called when an MTP device has been removed
+        // called when an PTP device has been removed
         void deviceRemoved(int id);
     }
 
diff --git a/media/java/android/media/MtpCursor.java b/media/java/android/media/PtpCursor.java
index dfd5e17..bb5b1ec 100644
--- a/media/java/android/media/MtpCursor.java
+++ b/media/java/android/media/PtpCursor.java
@@ -27,8 +27,8 @@ import java.util.HashMap;
   * Cursor class for PTP content provider
   * @hide
   */
-public final class MtpCursor extends AbstractWindowedCursor {
-    static final String TAG = "MtpCursor";
+public final class PtpCursor extends AbstractWindowedCursor {
+    static final String TAG = "PtpCursor";
     static final int NO_COUNT = -1;
 
     /* constants for queryType */
@@ -49,10 +49,10 @@ public final class MtpCursor extends AbstractWindowedCursor {
     private int mCount = NO_COUNT;
 
 
-    public MtpCursor(MtpClient client, int queryType, int deviceID, long storageID, long objectID,
+    public PtpCursor(PtpClient client, int queryType, int deviceID, long storageID, long objectID,
             String[] projection) {
         if (client == null) {
-            throw new NullPointerException("client null in MtpCursor constructor");
+            throw new NullPointerException("client null in PtpCursor constructor");
         }
         mColumns = projection;
 
@@ -132,19 +132,19 @@ public final class MtpCursor extends AbstractWindowedCursor {
     }
 
     /* Device Column IDs */
-     /* These must match the values in MtpCursor.cpp */
+     /* These must match the values in PtpCursor.cpp */
    private static final int DEVICE_ROW_ID          = 1;
     private static final int DEVICE_MANUFACTURER    = 2;
     private static final int DEVICE_MODEL           = 3;
 
     /* Storage Column IDs */
-    /* These must match the values in MtpCursor.cpp */
+    /* These must match the values in PtpCursor.cpp */
     private static final int STORAGE_ROW_ID         = 101;
     private static final int STORAGE_IDENTIFIER     = 102;
     private static final int STORAGE_DESCRIPTION    = 103;
 
     /* Object Column IDs */
-    /* These must match the values in MtpCursor.cpp */
+    /* These must match the values in PtpCursor.cpp */
     private static final int OBJECT_ROW_ID              = 201;
     private static final int OBJECT_STORAGE_ID          = 202;
     private static final int OBJECT_FORMAT              = 203;
@@ -211,7 +211,7 @@ public final class MtpCursor extends AbstractWindowedCursor {
     // used by the JNI code
     private int mNativeContext;
 
-    private native final void native_setup(MtpClient client, int queryType,
+    private native final void native_setup(PtpClient client, int queryType,
             int deviceID, long storageID, long objectID, int[] columns);
     private native final void native_finalize();
     private native void native_wait_for_event();
diff --git a/media/jni/Android.mk b/media/jni/Android.mk
index 25d243b..fbdfa67 100644
--- a/media/jni/Android.mk
+++ b/media/jni/Android.mk
@@ -9,10 +9,10 @@ LOCAL_SRC_FILES:= \
     android_media_ResampleInputStream.cpp \
     android_media_MediaProfiles.cpp \
     android_media_AmrInputStream.cpp \
-	android_media_MtpClient.cpp \
-	android_media_MtpCursor.cpp \
 	android_media_MtpDatabase.cpp \
 	android_media_MtpServer.cpp \
+	android_media_PtpClient.cpp \
+	android_media_PtpCursor.cpp \
 
 LOCAL_SHARED_LIBRARIES := \
     libandroid_runtime \
diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp
index 997d017..28aef0c 100644
--- a/media/jni/android_media_MediaPlayer.cpp
+++ b/media/jni/android_media_MediaPlayer.cpp
@@ -774,8 +774,8 @@ extern int register_android_media_MediaRecorder(JNIEnv *env);
 extern int register_android_media_MediaScanner(JNIEnv *env);
 extern int register_android_media_ResampleInputStream(JNIEnv *env);
 extern int register_android_media_MediaProfiles(JNIEnv *env);
-extern int register_android_media_MtpClient(JNIEnv *env);
-extern int register_android_media_MtpCursor(JNIEnv *env);
+extern int register_android_media_PtpClient(JNIEnv *env);
+extern int register_android_media_PtpCursor(JNIEnv *env);
 extern int register_android_media_MtpDatabase(JNIEnv *env);
 extern int register_android_media_MtpServer(JNIEnv *env);
 extern int register_android_media_AmrInputStream(JNIEnv *env);
@@ -826,13 +826,13 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved)
         goto bail;
     }
 
-    if (register_android_media_MtpClient(env) < 0) {
-        LOGE("ERROR: MtpClient native registration failed");
+    if (register_android_media_PtpClient(env) < 0) {
+        LOGE("ERROR: PtpClient native registration failed");
         goto bail;
     }
 
-    if (register_android_media_MtpCursor(env) < 0) {
-        LOGE("ERROR: MtpCursor native registration failed");
+    if (register_android_media_PtpCursor(env) < 0) {
+        LOGE("ERROR: PtpCursor native registration failed");
         goto bail;
     }
 
diff --git a/media/jni/android_media_MtpClient.cpp b/media/jni/android_media_PtpClient.cpp
index 144dfc8..6af83e4 100644
--- a/media/jni/android_media_MtpClient.cpp
+++ b/media/jni/android_media_PtpClient.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "MtpClientJNI"
+#define LOG_TAG "PtpClientJNI"
 #include "utils/Log.h"
 
 #include <stdio.h>
@@ -103,7 +103,7 @@ void MyClient::deviceRemoved(MtpDevice *device) {
 // ----------------------------------------------------------------------------
 
 static void
-android_media_MtpClient_setup(JNIEnv *env, jobject thiz)
+android_media_PtpClient_setup(JNIEnv *env, jobject thiz)
 {
 #ifdef HAVE_ANDROID_OS
     LOGD("setup\n");
@@ -114,7 +114,7 @@ android_media_MtpClient_setup(JNIEnv *env, jobject thiz)
 }
 
 static void
-android_media_MtpClient_finalize(JNIEnv *env, jobject thiz)
+android_media_PtpClient_finalize(JNIEnv *env, jobject thiz)
 {
 #ifdef HAVE_ANDROID_OS
     LOGD("finalize\n");
@@ -126,7 +126,7 @@ android_media_MtpClient_finalize(JNIEnv *env, jobject thiz)
 }
 
 static jboolean
-android_media_MtpClient_start(JNIEnv *env, jobject thiz)
+android_media_PtpClient_start(JNIEnv *env, jobject thiz)
 {
 #ifdef HAVE_ANDROID_OS
     LOGD("start\n");
@@ -138,7 +138,7 @@ android_media_MtpClient_start(JNIEnv *env, jobject thiz)
 }
 
 static void
-android_media_MtpClient_stop(JNIEnv *env, jobject thiz)
+android_media_PtpClient_stop(JNIEnv *env, jobject thiz)
 {
 #ifdef HAVE_ANDROID_OS
     LOGD("stop\n");
@@ -148,7 +148,7 @@ android_media_MtpClient_stop(JNIEnv *env, jobject thiz)
 }
 
 static jboolean
-android_media_MtpClient_delete_object(JNIEnv *env, jobject thiz,
+android_media_PtpClient_delete_object(JNIEnv *env, jobject thiz,
         jint device_id, jlong object_id)
 {
 #ifdef HAVE_ANDROID_OS
@@ -162,7 +162,7 @@ android_media_MtpClient_delete_object(JNIEnv *env, jobject thiz,
 }
 
 static jlong
-android_media_MtpClient_get_parent(JNIEnv *env, jobject thiz,
+android_media_PtpClient_get_parent(JNIEnv *env, jobject thiz,
         jint device_id, jlong object_id)
 {
 #ifdef HAVE_ANDROID_OS
@@ -176,7 +176,7 @@ android_media_MtpClient_get_parent(JNIEnv *env, jobject thiz,
 }
 
 static jlong
-android_media_MtpClient_get_storage_id(JNIEnv *env, jobject thiz,
+android_media_PtpClient_get_storage_id(JNIEnv *env, jobject thiz,
         jint device_id, jlong object_id)
 {
  #ifdef HAVE_ANDROID_OS
@@ -190,7 +190,7 @@ android_media_MtpClient_get_storage_id(JNIEnv *env, jobject thiz,
 }
 
 static jboolean
-android_media_MtpClient_import_file(JNIEnv *env, jobject thiz,
+android_media_PtpClient_import_file(JNIEnv *env, jobject thiz,
         jint device_id, jlong object_id, jstring dest_path)
 {
 #ifdef HAVE_ANDROID_OS
@@ -209,28 +209,28 @@ android_media_MtpClient_import_file(JNIEnv *env, jobject thiz,
 // ----------------------------------------------------------------------------
 
 static JNINativeMethod gMethods[] = {
-    {"native_setup",            "()V",  (void *)android_media_MtpClient_setup},
-    {"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",   "(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_setup",            "()V",  (void *)android_media_PtpClient_setup},
+    {"native_finalize",         "()V",  (void *)android_media_PtpClient_finalize},
+    {"native_start",            "()Z",  (void *)android_media_PtpClient_start},
+    {"native_stop",             "()V",  (void *)android_media_PtpClient_stop},
+    {"native_delete_object",   "(IJ)Z", (void *)android_media_PtpClient_delete_object},
+    {"native_get_parent",      "(IJ)J", (void *)android_media_PtpClient_get_parent},
+    {"native_get_storage_id",  "(IJ)J", (void *)android_media_PtpClient_get_storage_id},
     {"native_import_file",     "(IJLjava/lang/String;)Z",
-                                        (void *)android_media_MtpClient_import_file},
+                                        (void *)android_media_PtpClient_import_file},
 };
 
-static const char* const kClassPathName = "android/media/MtpClient";
+static const char* const kClassPathName = "android/media/PtpClient";
 
-int register_android_media_MtpClient(JNIEnv *env)
+int register_android_media_PtpClient(JNIEnv *env)
 {
     jclass clazz;
 
-    LOGD("register_android_media_MtpClient\n");
+    LOGD("register_android_media_PtpClient\n");
 
-    clazz = env->FindClass("android/media/MtpClient");
+    clazz = env->FindClass("android/media/PtpClient");
     if (clazz == NULL) {
-        LOGE("Can't find android/media/MtpClient");
+        LOGE("Can't find android/media/PtpClient");
         return -1;
     }
     method_deviceAdded = env->GetMethodID(clazz, "deviceAdded", "(I)V");
@@ -245,10 +245,10 @@ int register_android_media_MtpClient(JNIEnv *env)
     }
     field_context = env->GetFieldID(clazz, "mNativeContext", "I");
     if (field_context == NULL) {
-        LOGE("Can't find MtpClient.mNativeContext");
+        LOGE("Can't find PtpClient.mNativeContext");
         return -1;
     }
 
     return AndroidRuntime::registerNativeMethods(env,
-                "android/media/MtpClient", gMethods, NELEM(gMethods));
+                "android/media/PtpClient", gMethods, NELEM(gMethods));
 }
diff --git a/media/jni/android_media_MtpCursor.cpp b/media/jni/android_media_PtpCursor.cpp
index 7a0ae8a..c5af3a8 100644
--- a/media/jni/android_media_MtpCursor.cpp
+++ b/media/jni/android_media_PtpCursor.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "MtpCursorJNI"
+#define LOG_TAG "PtpCursorJNI"
 #include "utils/Log.h"
 
 #include <stdio.h>
@@ -37,7 +37,7 @@ using namespace android;
 
 static jfieldID field_context;
 
-// From android_media_MtpClient.cpp
+// From android_media_PtpClient.cpp
 MtpClient * get_client_from_object(JNIEnv * env, jobject javaClient);
 
 // ----------------------------------------------------------------------------
@@ -48,11 +48,11 @@ static bool ExceptionCheck(void* env)
 }
 
 static void
-android_media_MtpCursor_setup(JNIEnv *env, jobject thiz, jobject javaClient,
+android_media_PtpCursor_setup(JNIEnv *env, jobject thiz, jobject javaClient,
         jint queryType, jint deviceID, jlong storageID, jlong objectID, jintArray javaColumns)
 {
 #ifdef HAVE_ANDROID_OS
-    LOGD("android_media_MtpCursor_setup queryType: %d deviceID: %d storageID: %lld objectID: %lld\n",
+    LOGD("android_media_PtpCursor_setup queryType: %d deviceID: %d storageID: %lld objectID: %lld\n",
                 queryType, deviceID, storageID, objectID);
 
     int* columns = NULL;
@@ -73,7 +73,7 @@ android_media_MtpCursor_setup(JNIEnv *env, jobject thiz, jobject javaClient,
 }
 
 static void
-android_media_MtpCursor_finalize(JNIEnv *env, jobject thiz)
+android_media_PtpCursor_finalize(JNIEnv *env, jobject thiz)
 {
 #ifdef HAVE_ANDROID_OS
     LOGD("finalize\n");
@@ -83,7 +83,7 @@ android_media_MtpCursor_finalize(JNIEnv *env, jobject thiz)
 }
 
 static jint
-android_media_MtpCursor_fill_window(JNIEnv *env, jobject thiz, jobject javaWindow, jint startPos)
+android_media_PtpCursor_fill_window(JNIEnv *env, jobject thiz, jobject javaWindow, jint startPos)
 {
 #ifdef HAVE_ANDROID_OS
     CursorWindow* window = get_window_from_object(env, javaWindow);
@@ -104,33 +104,33 @@ android_media_MtpCursor_fill_window(JNIEnv *env, jobject thiz, jobject javaWindo
 // ----------------------------------------------------------------------------
 
 static JNINativeMethod gMethods[] = {
-    {"native_setup",            "(Landroid/media/MtpClient;IIJJ[I)V",
-                                        (void *)android_media_MtpCursor_setup},
-    {"native_finalize",         "()V",  (void *)android_media_MtpCursor_finalize},
+    {"native_setup",            "(Landroid/media/PtpClient;IIJJ[I)V",
+                                        (void *)android_media_PtpCursor_setup},
+    {"native_finalize",         "()V",  (void *)android_media_PtpCursor_finalize},
     {"native_fill_window",      "(Landroid/database/CursorWindow;I)I",
-                                        (void *)android_media_MtpCursor_fill_window},
+                                        (void *)android_media_PtpCursor_fill_window},
 
 };
 
-static const char* const kClassPathName = "android/media/MtpCursor";
+static const char* const kClassPathName = "android/media/PtpCursor";
 
-int register_android_media_MtpCursor(JNIEnv *env)
+int register_android_media_PtpCursor(JNIEnv *env)
 {
     jclass clazz;
 
-    LOGD("register_android_media_MtpCursor\n");
+    LOGD("register_android_media_PtpCursor\n");
 
-    clazz = env->FindClass("android/media/MtpCursor");
+    clazz = env->FindClass("android/media/PtpCursor");
     if (clazz == NULL) {
-        LOGE("Can't find android/media/MtpCursor");
+        LOGE("Can't find android/media/PtpCursor");
         return -1;
     }
     field_context = env->GetFieldID(clazz, "mNativeContext", "I");
     if (field_context == NULL) {
-        LOGE("Can't find MtpCursor.mNativeContext");
+        LOGE("Can't find PtpCursor.mNativeContext");
         return -1;
     }
 
     return AndroidRuntime::registerNativeMethods(env,
-                "android/media/MtpCursor", gMethods, NELEM(gMethods));
+                "android/media/PtpCursor", gMethods, NELEM(gMethods));
 }