Merge "use updated mStorage for new MtpObject when copy file between storages"

2020-06-02 06:14:31 +00:00
parent 618edf7fda 5be80641b7
commit 587620cc62
1 changed files with 7 additions and 0 deletions
--- a/media/java/android/mtp/MtpStorageManager.java
+++ b/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;