Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0b8b321 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

Rename MtpClient and MtpCursor to PtpClient and PtpCursor 



Change-Id: I26fce3bf32c8e9c8d592106af7ab4c35b19e0996
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent a3156059

media/java/android/media/MtpClient.java→media/java/android/media/PtpClient.java

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

    }

media/java/android/media/MtpCursor.java→media/java/android/media/PtpCursor.java

+8 −8
Original line number Diff line number Diff line
@@ -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();

media/jni/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -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 \

media/jni/android_media_MediaPlayer.cpp

+6 −6
Original line number Diff line number Diff line
@@ -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;

    }

media/jni/android_media_MtpClient.cpp→media/jni/android_media_PtpClient.cpp

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

}