Merge "use updated mStorage for new MtpObject when copy file between storages" am: 587620cc62 am: 7c7680f261

Original change: undetermined

Change-Id: I55cee281ffbd62bee688831844d3f2b071666e4c

media/java/android/mtp/MtpStorageManager.java

@@ -229,9 +229,16 @@ public class MtpStorageManager {
         }
 
         private void setParent(MtpObject parent) {
+            if (this.getStorageId() != parent.getStorageId()) {
+                mStorage = Preconditions.checkNotNull(parent.getStorage());
+            }
             mParent = parent;
         }
 
+        private MtpStorage getStorage() {
+            return mStorage;
+        }
+
         private void setDir(boolean dir) {
             if (dir != mIsDir) {
                 mIsDir = dir;