Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1557e2bf authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "MTP: Update language to comply with Android's inclusive language... 

Merge "MTP: Update language to comply with Android's inclusive language guidance" am: 86b6f66d am: 5e5716ef am: 27f9f37c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5df055458ced225b8c6d3046617a7dd620d590e
parents 0eed8e43 27f9f37c

media/java/android/mtp/MtpStorageManager.java

+3 −3
Original line number Diff line number Diff line
@@ -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();