Merge "Update language to comply with Android's inclusive language guidance" am: 4aab6d6cfe (22298bfb) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -942,8 +942,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;

		@@ -29334,7 +29333,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();