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

        }

        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;