commit e242f12c0f33518e0760fabfdad8cb93a1c8a2fb
author Jerry Zhang <zhangjerry@google.com> Mon Oct 16 14:54:08 2017 -0700
committer Jerry Zhang <zhangjerry@google.com> Thu Oct 19 17:55:26 2017 +0000
tree c12c22ff3550202df1af4a0816f6ee3c489f3938
parent 49d0502f1a227a510df65ec74f14eef91185dc6a

Account for folders in copy and move.

Copy and move will use mkdir() if target
is a folder, and copyFile() if target is a file.

Move will recursively copy contents if moving
between different storages. Move will also
change the storageId.

Bug: 67028892
Test: Copy and move folders on win 10
Change-Id: If114ef74b9d8668cf66d45953d9ea8b17bc11ae8

media/mtp/MtpDatabase.h

diff --git a/media/mtp/MtpDatabase.h b/media/mtp/MtpDatabase.h
index c7021df..2395f4f 100644
--- a/media/mtp/MtpDatabase.h
+++ b/media/mtp/MtpDatabase.h
@@ -104,7 +104,7 @@
     virtual MtpProperty*            getDevicePropertyDesc(MtpDeviceProperty property) = 0;
 
     virtual MtpResponseCode         moveObject(MtpObjectHandle handle, MtpObjectHandle newParent,
-                                            MtpString& newPath) = 0;
+                                            MtpStorageID newStorage, MtpString& newPath) = 0;
 
     virtual void                    sessionStarted() = 0;