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

Commit 7a047c89 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

MTP: Implement GetNumObjects 



Change-Id: Iccc3a445f9a1eab7bb76eddd567c6a3a8f155b2b
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent 59c777a2

media/java/android/media/MtpDatabase.java

+27 −0
Original line number Diff line number Diff line
@@ -164,6 +164,33 @@ public class MtpDatabase { 
        return null;

    }



    private int getNumObjects(int storageID, int format, int parent) {

        // we can ignore storageID until we support multiple storages

        Log.d(TAG, "getObjectList parent: " + parent);

        Cursor c = null;

        try {

            if (format != 0) {

                c = mMediaProvider.query(mObjectsUri, ID_PROJECTION,

                            PARENT_FORMAT_WHERE,

                            new String[] { Integer.toString(parent), Integer.toString(format) },

                             null);

            } else {

                c = mMediaProvider.query(mObjectsUri, ID_PROJECTION,

                            PARENT_WHERE, new String[] { Integer.toString(parent) }, null);

            }

            if (c != null) {

                return c.getCount();

            }

        } catch (RemoteException e) {

            Log.e(TAG, "RemoteException in getNumObjects", e);

        } finally {

            if (c != null) {

                c.close();

            }

        }

        return -1;

    }



    private int getObjectProperty(int handle, int property,

                            long[] outIntValue, char[] outStringValue) {

        Log.d(TAG, "getObjectProperty: " + property);

media/jni/android_media_MtpDatabase.cpp

+19 −4
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ using namespace android; 
static jmethodID method_beginSendObject;

static jmethodID method_endSendObject;

static jmethodID method_getObjectList;

static jmethodID method_getNumObjects;

static jmethodID method_getObjectProperty;

static jmethodID method_getObjectInfo;

static jmethodID method_getObjectFilePath;
@@ -80,6 +81,10 @@ public: 
                                    MtpObjectFormat format,

                                    MtpObjectHandle parent);



    virtual int                     getNumObjects(MtpStorageID storageID,

                                            MtpObjectFormat format,

                                            MtpObjectHandle parent);



    virtual MtpResponseCode         getObjectProperty(MtpObjectHandle handle,

                                            MtpObjectProperty property,

                                            MtpDataPacket& packet);
@@ -164,15 +169,20 @@ MtpObjectHandleList* MyMtpDatabase::getObjectList(MtpStorageID storageID, 
    MtpObjectHandleList* list = new MtpObjectHandleList();

    jint* handles = env->GetIntArrayElements(array, 0);

    jsize length = env->GetArrayLength(array);

LOGD("getObjectList length: %d", length);

    for (int i = 0; i < length; i++) {

LOGD("push: %d", handles[i]);

    for (int i = 0; i < length; i++)

        list->push(handles[i]);

    }

   env->ReleaseIntArrayElements(array, handles, 0);

   return list;

}



int MyMtpDatabase::getNumObjects(MtpStorageID storageID,

                                MtpObjectFormat format,

                                MtpObjectHandle parent) {

    JNIEnv* env = AndroidRuntime::getJNIEnv();

    return env->CallIntMethod(mDatabase, method_getNumObjects,

                (jint)storageID, (jint)format, (jint)parent);

}



MtpResponseCode MyMtpDatabase::getObjectProperty(MtpObjectHandle handle,

                                            MtpObjectProperty property,

                                            MtpDataPacket& packet) {
@@ -407,6 +417,11 @@ int register_android_media_MtpDatabase(JNIEnv *env) 
        LOGE("Can't find getObjectList");

        return -1;

    }

    method_getNumObjects = env->GetMethodID(clazz, "getNumObjects", "(III)I");

    if (method_getNumObjects == NULL) {

        LOGE("Can't find getNumObjects");

        return -1;

    }

    method_getObjectProperty = env->GetMethodID(clazz, "getObjectProperty", "(II[J[C)I");

    if (method_getObjectProperty == NULL) {

        LOGE("Can't find getObjectProperty");

media/mtp/MtpDatabase.h

+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ public: 
                                            MtpObjectFormat format,

                                            MtpObjectHandle parent) = 0;



    virtual int                     getNumObjects(MtpStorageID storageID,

                                            MtpObjectFormat format,

                                            MtpObjectHandle parent) = 0;



    virtual MtpResponseCode         getObjectProperty(MtpObjectHandle handle,

                                            MtpObjectProperty property,

                                            MtpDataPacket& packet) = 0;

media/mtp/MtpServer.cpp

+28 −5
Original line number Diff line number Diff line
@@ -55,10 +55,10 @@ static const MtpOperationCode kSupportedOperationCodes[] = { 
//    MTP_OPERATION_SELF_TEST,

//    MTP_OPERATION_SET_OBJECT_PROTECTION,

//    MTP_OPERATION_POWER_DOWN,

    MTP_OPERATION_GET_DEVICE_PROP_DESC,

    MTP_OPERATION_GET_DEVICE_PROP_VALUE,

    MTP_OPERATION_SET_DEVICE_PROP_VALUE,

    MTP_OPERATION_RESET_DEVICE_PROP_VALUE,

//    MTP_OPERATION_GET_DEVICE_PROP_DESC,

//    MTP_OPERATION_GET_DEVICE_PROP_VALUE,

//    MTP_OPERATION_SET_DEVICE_PROP_VALUE,

//    MTP_OPERATION_RESET_DEVICE_PROP_VALUE,

//    MTP_OPERATION_TERMINATE_OPEN_CAPTURE,

//    MTP_OPERATION_MOVE_OBJECT,

//    MTP_OPERATION_COPY_OBJECT,
@@ -67,7 +67,7 @@ static const MtpOperationCode kSupportedOperationCodes[] = { 
    MTP_OPERATION_GET_OBJECT_PROPS_SUPPORTED,

//    MTP_OPERATION_GET_OBJECT_PROP_DESC,

    MTP_OPERATION_GET_OBJECT_PROP_VALUE,

    MTP_OPERATION_SET_OBJECT_PROP_VALUE,

//    MTP_OPERATION_SET_OBJECT_PROP_VALUE,

//    MTP_OPERATION_GET_OBJECT_REFERENCES,

//    MTP_OPERATION_SET_OBJECT_REFERENCES,

//    MTP_OPERATION_SKIP,
@@ -308,6 +308,9 @@ bool MtpServer::handleRequest() { 
        case MTP_OPERATION_GET_OBJECT_HANDLES:

            response = doGetObjectHandles();

            break;

        case MTP_OPERATION_GET_NUM_OBJECTS:

            response = doGetNumObjects();

            break;

        case MTP_OPERATION_GET_OBJECT_PROP_VALUE:

            response = doGetObjectPropValue();

            break;
@@ -454,6 +457,26 @@ MtpResponseCode MtpServer::doGetObjectHandles() { 
    return MTP_RESPONSE_OK;

}



MtpResponseCode MtpServer::doGetNumObjects() {

    if (!mSessionOpen)

        return MTP_RESPONSE_SESSION_NOT_OPEN;

    MtpStorageID storageID = mRequest.getParameter(1);      // 0xFFFFFFFF for all storage

    MtpObjectFormat format = mRequest.getParameter(2);      // 0 for all formats

    MtpObjectHandle parent = mRequest.getParameter(3);      // 0xFFFFFFFF for objects with no parent

                                                            // 0x00000000 for all objects?

    if (parent == 0xFFFFFFFF)

        parent = 0;



    int count = mDatabase->getNumObjects(storageID, format, parent);

    if (count >= 0) {

        mResponse.setParameter(1, count);

        return MTP_RESPONSE_OK;

    } else {

        mResponse.setParameter(1, 0);

        return MTP_RESPONSE_INVALID_OBJECT_HANDLE;

    }

}



MtpResponseCode MtpServer::doGetObjectPropValue() {

    MtpObjectHandle handle = mRequest.getParameter(1);

    MtpObjectProperty property = mRequest.getParameter(2);

media/mtp/MtpServer.h

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ private: 
    MtpResponseCode     doGetStorageInfo();

    MtpResponseCode     doGetObjectPropsSupported();

    MtpResponseCode     doGetObjectHandles();

    MtpResponseCode     doGetNumObjects();

    MtpResponseCode     doGetObjectPropValue();

    MtpResponseCode     doGetObjectInfo();

    MtpResponseCode     doGetObject();