summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-07-31 16:29:07 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-07-31 16:29:07 +0000
commitacbb11f541a4a844dc511b636ae2188a1bdc7ae2 (patch)
tree45266a79d187f2eb20c35d63ab3686e03a4af6eb
parentb3252fa9c4ddc06beed621c08259be3d6d7d704e (diff)
parent9bade1651684eba44f67f498d4b2f0199b780f0a (diff)
Merge "Update language to comply with Android's inclusive language guidance" am: e2d9b14b60 am: 6f22d2c310 am: 9bade16516
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382541 Change-Id: I7e66cab05528c20fe01549f98eabff544e7d64b7
-rw-r--r--core/java/android/os/DropBoxManager.java2
-rw-r--r--core/java/android/os/FileUtils.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/os/DropBoxManager.java b/core/java/android/os/DropBoxManager.java
index 18ba5a8a4a34..fd576c94b194 100644
--- a/core/java/android/os/DropBoxManager.java
+++ b/core/java/android/os/DropBoxManager.java
@@ -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}.
*/
diff --git a/core/java/android/os/FileUtils.java b/core/java/android/os/FileUtils.java
index 87e70431bd12..70c924a46c17 100644
--- a/core/java/android/os/FileUtils.java
+++ b/core/java/android/os/FileUtils.java
@@ -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':