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

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

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

Merge "Update language to comply with Android's inclusive language guidance" am: e2d9b14b am: 6f22d2c3 am: 9bade165

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

Change-Id: I7e66cab05528c20fe01549f98eabff544e7d64b7
parents b3252fa9 9bade165

core/java/android/os/DropBoxManager.java

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ public class DropBoxManager { 
    }



    /**

     * Create a dummy instance for testing.  All methods will fail unless

     * Create an instance for testing. All methods will fail unless

     * overridden with an appropriate mock implementation.  To obtain a

     * functional instance, use {@link android.content.Context#getSystemService}.

     */

core/java/android/os/FileUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -1306,7 +1306,7 @@ public final class FileUtils { 


    /** {@hide} */

    public static int translateModeStringToPosix(String mode) {

        // Sanity check for invalid chars

        // Quick check for invalid chars

        for (int i = 0; i < mode.length(); i++) {

            switch (mode.charAt(i)) {

                case 'r':