Clean up MtpDatabase API.

Return MTP response codes instead of booleans for success or failure.
Remove some unused code.

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

1 files changed, 11 insertions, 36 deletions

diff --git a/media/jni/android_media_MtpDatabase.cpp b/media/jni/android_media_MtpDatabase.cpp
index be59362..9e1ede5 100644
--- a/media/jni/android_media_MtpDatabase.cpp
+++ b/media/jni/android_media_MtpDatabase.cpp
@@ -87,17 +87,10 @@ public:
     virtual MtpResponseCode         getObjectInfo(MtpObjectHandle handle,
                                             MtpDataPacket& packet);
 
-    virtual bool                    getObjectFilePath(MtpObjectHandle handle,
+    virtual MtpResponseCode         getObjectFilePath(MtpObjectHandle handle,
                                             MtpString& filePath,
                                             int64_t& fileLength);
-    virtual bool                    deleteFile(MtpObjectHandle handle);
-
-    // helper for media scanner
-    virtual MtpObjectHandle*        getFileList(int& outCount);
-
-    virtual void                    beginTransaction();
-    virtual void                    commitTransaction();
-    virtual void                    rollbackTransaction();
+    virtual MtpResponseCode         deleteFile(MtpObjectHandle handle);
 
     bool                            getPropertyInfo(MtpObjectProperty property, int& type);
 };
@@ -290,14 +283,14 @@ MtpResponseCode MyMtpDatabase::getObjectInfo(MtpObjectHandle handle,
     return MTP_RESPONSE_OK;
 }
 
-bool MyMtpDatabase::getObjectFilePath(MtpObjectHandle handle,
+MtpResponseCode MyMtpDatabase::getObjectFilePath(MtpObjectHandle handle,
                                             MtpString& filePath,
                                             int64_t& fileLength) {
     JNIEnv* env = AndroidRuntime::getJNIEnv();
-    jboolean result = env->CallBooleanMethod(mDatabase, method_getObjectFilePath,
+    jint result = env->CallIntMethod(mDatabase, method_getObjectFilePath,
                 (jint)handle, mStringBuffer, mLongBuffer);
-    if (!result)
-        return false;
+    if (result != MTP_RESPONSE_OK)
+        return result;
 
     jchar* str = env->GetCharArrayElements(mStringBuffer, 0);
     filePath.setTo(str, strlen16(str));
@@ -307,30 +300,12 @@ bool MyMtpDatabase::getObjectFilePath(MtpObjectHandle handle,
     fileLength = longValues[0];
     env->ReleaseLongArrayElements(mLongBuffer, longValues, 0);
     
-    return true;
+    return result;
 }
 
-bool MyMtpDatabase::deleteFile(MtpObjectHandle handle) {
+MtpResponseCode MyMtpDatabase::deleteFile(MtpObjectHandle handle) {
     JNIEnv* env = AndroidRuntime::getJNIEnv();
-    return env->CallBooleanMethod(mDatabase, method_deleteFile, (jint)handle); 
-}
-
-    // helper for media scanner
-MtpObjectHandle* MyMtpDatabase::getFileList(int& outCount) {
-    // REMOVE ME
-    return NULL;
-}
-
-void MyMtpDatabase::beginTransaction() {
-    // REMOVE ME
-}
-
-void MyMtpDatabase::commitTransaction() {
-    // REMOVE ME
-}
-
-void MyMtpDatabase::rollbackTransaction() {
-    // REMOVE ME
+    return env->CallIntMethod(mDatabase, method_deleteFile, (jint)handle);
 }
 
 struct PropertyTableEntry {
@@ -442,12 +417,12 @@ int register_android_media_MtpDatabase(JNIEnv *env)
         LOGE("Can't find getObjectInfo");
         return -1;
     }
-    method_getObjectFilePath = env->GetMethodID(clazz, "getObjectFilePath", "(I[C[J)Z");
+    method_getObjectFilePath = env->GetMethodID(clazz, "getObjectFilePath", "(I[C[J)I");
     if (method_getObjectFilePath == NULL) {
         LOGE("Can't find getObjectFilePath");
         return -1;
     }
-    method_deleteFile = env->GetMethodID(clazz, "deleteFile", "(I)Z");
+    method_deleteFile = env->GetMethodID(clazz, "deleteFile", "(I)I");
     if (method_deleteFile == NULL) {
         LOGE("Can't find deleteFile");
         return -1;