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

Commit acf25a76 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

Original change: undetermined

Change-Id: I15d0effc28a2706d91fafe4b9f4da9952b8938a5
parents 15225683 5667f0d2

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;