summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author joker.yang <joker.yang@unisoc.com> 2020-01-16 08:16:05 +0800
committer joker yang <joker.yang@unisoc.com> 2020-05-30 06:39:25 +0000
commit5be80641b71a46ac3af7b234ba898c2393da1e97 (patch)
tree6554dc97d33f272a3014461de5b4aa176490026c
parent2b0ac97d95b936bdd5bc79faeb751a56743e2cc6 (diff)
use updated mStorage for new MtpObject when copy file between storages
copy file from sdcard to internal storage through MTP, then the file can't be renamed bug: 147715888 Change-Id: Iffeeeb1372e0ecf305cf0c70edb601a4b2001342
-rw-r--r--media/java/android/mtp/MtpStorageManager.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/media/java/android/mtp/MtpStorageManager.java b/media/java/android/mtp/MtpStorageManager.java
index e783788d0158..c0eb5e8bbea9 100644
--- a/media/java/android/mtp/MtpStorageManager.java
+++ b/media/java/android/mtp/MtpStorageManager.java
@@ -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;