From 5be80641b71a46ac3af7b234ba898c2393da1e97 Mon Sep 17 00:00:00 2001
From: "joker.yang" <joker.yang@unisoc.com>
Date: Thu, 16 Jan 2020 08:16:05 +0800
Subject: [PATCH] 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
---
 media/java/android/mtp/MtpStorageManager.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/media/java/android/mtp/MtpStorageManager.java b/media/java/android/mtp/MtpStorageManager.java
index e783788d01585..c0eb5e8bbea9e 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;