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

Merge "MTP: Update language to comply with Android's inclusive language guidance" am: 86b6f66d9f am: 5e5716ef83

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382396

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id177580f106509fab9ec6e706ed9a80b11dd16dc
This commit is contained in:
Treehugger Robot
2021-01-07 17:45:06 +00:00
committed by Automerger Merge Worker
parent 16a8431f5c 5e5716ef83
commit 27f9f37c0b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -958,7 +958,7 @@ public class MtpStorageManager {
MtpObject parent = obj.getParent();
MtpObject oldObj = parent.getChild(oldName);
if (!success) {
// If the rename failed, we want oldObj to be the original and obj to be the dummy.
// If the rename failed, we want oldObj to be the original and obj to be the stand-in.
// Switch the objects, except for their name and state.
MtpObject temp = oldObj;
MtpObjectState oldState = oldObj.getState();
@@ -1034,7 +1034,7 @@ public class MtpStorageManager {
return generalBeginRemoveObject(obj, MtpOperation.RENAME)
&& generalBeginCopyObject(newObj, false);
}
// Move obj to new parent, create a dummy object in the old parent.
// Move obj to new parent, create a fake object in the old parent.
MtpObject oldObj = obj.copy(false);
obj.setParent(newParent);
oldObj.getParent().addChild(oldObj);
@@ -1063,7 +1063,7 @@ public class MtpStorageManager {
return generalEndCopyObject(newObj, success, true) && ret;
}
if (!success) {
// If the rename failed, we want oldObj to be the original and obj to be the dummy.
// If the rename failed, we want oldObj to be the original and obj to be the stand-in.
// Switch the objects, except for their parent and state.
MtpObject temp = oldObj;
MtpObjectState oldState = oldObj.getState();