commit c03d26f24aa61d5606355a22ef0cefe17e98a815
author James Wei <jameswei@google.com> Tue Jun 02 07:23:53 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 02 07:23:53 2020 +0000
tree f7ce1149e202801d0d799bc3ccfbf0799dd6c0df
parent 9b618759d04aad96aff5987e6e3c2d222eff18f5
parent 3d5f350c917feb6c9d08542d38788005187a6d32

Merge "use updated mStorage for new MtpObject when copy file between storages" am: 587620cc62 am: 7c7680f261 am: 5667f0d272 am: acf25a7601 am: 3d5f350c91

Original change: undetermined

Change-Id: Ib1bb581602d07a9474d83701186dd03f973e2c31

media/java/android/mtp/MtpStorageManager.java

diff --git a/media/java/android/mtp/MtpStorageManager.java b/media/java/android/mtp/MtpStorageManager.java
index e783788..c0eb5e8 100644
--- a/media/java/android/mtp/MtpStorageManager.java
+++ b/media/java/android/mtp/MtpStorageManager.java
@@ -229,9 +229,16 @@
         }
 
         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;