Commit c03d26f2 authored Jun 02, 2020 by James Wei Committed by Automerger Merge Worker Jun 02, 2020

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

Merge "use updated mStorage for new MtpObject when copy file between storages" am: 587620cc am: 7c7680f2 am: 5667f0d2 am: acf25a76 am: 3d5f350c

Original change: undetermined

Change-Id: Ib1bb581602d07a9474d83701186dd03f973e2c31

media/java/android/mtp/MtpStorageManager.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -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;