commit fed8bb604c31bf6a60ca84aafed016d21d3e0f90
author Mike Lockwood <lockwood@google.com> Thu Dec 01 16:58:41 2011 -0500
committer Mike Lockwood <lockwood@google.com> Fri Dec 02 15:12:47 2011 -0500
tree b6241932aebde1c0f71c9d52d63bb2ea7ef5adf7
parent 8af4c7d02fc484ed1bdc082fc2a5383bc50f2180

MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE

Bug: 5527220

Change-Id: I81d6de590ea3002118ba46eb4b6d5fe9061c998c
Signed-off-by: Mike Lockwood <lockwood@google.com>

media/mtp/MtpServer.cpp

diff --git a/media/mtp/MtpServer.cpp b/media/mtp/MtpServer.cpp
index dc6c011..1dcfb74 100644
--- a/media/mtp/MtpServer.cpp
+++ b/media/mtp/MtpServer.cpp
@@ -1053,11 +1053,14 @@
     int result = mDatabase->getObjectFilePath(handle, filePath, fileLength, format);
     if (result == MTP_RESPONSE_OK) {
         LOGV("deleting %s", (const char *)filePath);
-        deletePath((const char *)filePath);
-        return mDatabase->deleteFile(handle);
-    } else {
-        return result;
+        result = mDatabase->deleteFile(handle);
+        // Don't delete the actual files unless the database deletion is allowed
+        if (result == MTP_RESPONSE_OK) {
+            deletePath((const char *)filePath);
+        }
     }
+
+    return result;
 }
 
 MtpResponseCode MtpServer::doGetObjectPropDesc() {