From bbf55a3fcdf2cc10b266f30a89c154e3a53bf8de Mon Sep 17 00:00:00 2001 From: James Wei Date: Fri, 31 Jul 2020 07:48:29 +0000 Subject: MTP: Update language to comply with Android's inclusive language guidance See https://source.android.com/setup/contribute/respectful-code for reference BUG=162536543 Change-Id: Ide3483e78ce66deb9bdda2a0d54feb8f70748832 --- media/java/android/mtp/MtpStorageManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'media') diff --git a/media/java/android/mtp/MtpStorageManager.java b/media/java/android/mtp/MtpStorageManager.java index c0eb5e8bbea9..0bede0dccbed 100644 --- a/media/java/android/mtp/MtpStorageManager.java +++ b/media/java/android/mtp/MtpStorageManager.java @@ -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(); -- cgit v1.2.3