Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "use updated mStorage for new MtpObject when copy file between storages" am: 587620cc62

Browse Source 
Original change: undetermined

Change-Id: Idd913941d77d59b4de4325043dd7f40c5188de1d
This commit is contained in:
James Wei
2020-06-02 06:27:44 +00:00
committed by Automerger Merge Worker
parent 33658d2f6c 587620cc62
commit 7c7680f261
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/java/android/mtp/MtpStorageManager.java
View File

@@ -229,9 +229,16 @@ public class MtpStorageManager {
} }
private void setParent(MtpObject parent) { private void setParent(MtpObject parent) {
if (this.getStorageId() != parent.getStorageId()) {
mStorage = Preconditions.checkNotNull(parent.getStorage());
}
mParent = parent; mParent = parent;
} }
private MtpStorage getStorage() {
return mStorage;
}
private void setDir(boolean dir) { private void setDir(boolean dir) {
if (dir != mIsDir) { if (dir != mIsDir) {
mIsDir = dir; mIsDir = dir;