Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d5f350c authored by James Wei's avatar James Wei Committed by Automerger Merge Worker
Browse files

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

Original change: undetermined

Change-Id: I08b9f64ba4fb60f1e5ff5b5f594375b54a748874
parents e75422ad acf25a76

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;