commit 27afe3a1cc9c07ac4884a7720087a597aea3c76f
author Mike Lockwood <lockwood@android.com> Fri Nov 19 13:52:20 2010 -0500
committer Mike Lockwood <lockwood@android.com> Fri Nov 19 13:55:22 2010 -0500
tree 9b82ea60a4996f39d1e0a33cc1fb300f7771143b
parent b9ff444a7eaf7ffd43970c0477110c6808bd4a7c

PTP: Fix permissions problems with files imported via PTP

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

media/mtp/MtpDevice.cpp

diff --git a/media/mtp/MtpDevice.cpp b/media/mtp/MtpDevice.cpp
index 1b23a8e..416ebfe 100644
--- a/media/mtp/MtpDevice.cpp
+++ b/media/mtp/MtpDevice.cpp
@@ -349,7 +349,7 @@
 }
 
 // reads the object's data and writes it to the specified file path
-bool MtpDevice::readObject(MtpObjectHandle handle, const char* destPath) {
+bool MtpDevice::readObject(MtpObjectHandle handle, const char* destPath, int group, int perm) {
     LOGD("readObject: %s", destPath);
     int fd = ::open(destPath, O_RDWR | O_CREAT | O_TRUNC);
     if (fd < 0) {
@@ -357,6 +357,12 @@
         return false;
     }
 
+    fchown(fd, getuid(), group);
+    // set permissions
+    int mask = umask(0);
+    fchmod(fd, perm);
+    umask(mask);
+
     Mutex::Autolock autoLock(mMutex);
     bool result = false;
 

media/mtp/MtpDevice.h

diff --git a/media/mtp/MtpDevice.h b/media/mtp/MtpDevice.h
index 720502c..21c85d5 100644
--- a/media/mtp/MtpDevice.h
+++ b/media/mtp/MtpDevice.h
@@ -75,7 +75,8 @@
     MtpDeviceInfo*          getDeviceInfo();
     MtpStorageIDList*       getStorageIDs();
     MtpStorageInfo*         getStorageInfo(MtpStorageID storageID);
-    MtpObjectHandleList*    getObjectHandles(MtpStorageID storageID, MtpObjectFormat format, MtpObjectHandle parent);
+    MtpObjectHandleList*    getObjectHandles(MtpStorageID storageID, MtpObjectFormat format,
+                                    MtpObjectHandle parent);
     MtpObjectInfo*          getObjectInfo(MtpObjectHandle handle);
     void*                   getThumbnail(MtpObjectHandle handle, int& outLength);
     MtpObjectHandle         sendObjectInfo(MtpObjectInfo* info);
@@ -86,7 +87,8 @@
 
     MtpProperty*            getDevicePropDesc(MtpDeviceProperty code);
 
-    bool                   readObject(MtpObjectHandle handle, const char* destPath);
+    bool                   readObject(MtpObjectHandle handle, const char* destPath, int group,
+                                    int perm);
 
 private:
     bool                    sendRequest(MtpOperationCode operation);