Merge "Update language to comply with Android's inclusive language guidance" am: 4aab6d6cfe am: 22298bfb7a

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

Change-Id: I29dbd2c00e3e4f22e14024ed61e4eb931063d48a

1 files changed, 2 insertions, 3 deletions

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index ca424e79ed7b..6837b7adc86d 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -951,8 +951,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
 
     /**
      * Prior to P, {@code #startDragAndDrop} accepts a builder which produces an empty drag shadow.
-     * Currently zero size SurfaceControl cannot be created thus we create a dummy 1x1 surface
-     * instead.
+     * Currently zero size SurfaceControl cannot be created thus we create a 1x1 surface instead.
      */
     private static boolean sAcceptZeroSizeDragShadow;
 
@@ -29899,7 +29898,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
 
     /**
      * Dump all private flags in readable format, useful for documentation and
-     * sanity checking.
+     * consistency checking.
      */
     private static void dumpFlags() {
         final HashMap<String, String> found = Maps.newHashMap();