Merge "Update language to comply with Android's inclusive language guidance" into main (8b3dfbf7) · Commits · e / os / android_frameworks_base

tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/GraphExporter.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ public class GraphExporter {
		getDotName(target.getFilter().getName()) + ":" +
		getDotName(target.getName()) + "_IN;\n" );
		} else {
		// Found a unconnected output port, add dummy node
		// Found a unconnected output port, add placeholder node
		String color = filter.getSignature().getOutputPortInfo(portName).isRequired()
		? "red" : "blue"; // red for unconnected, required ports
		dotFile.write(" " +
		@@ -131,7 +131,7 @@ public class GraphExporter {
		if(target != null) {
		// Found a connection -- nothing to do, connections have been written out above
		} else {
		// Found a unconnected input port, add dummy node
		// Found a unconnected input port, add placeholder node
		String color = filter.getSignature().getInputPortInfo(portName).isRequired()
		? "red" : "blue"; // red for unconnected, required ports
		dotFile.write(" " +

tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/MffContext.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -66,9 +66,9 @@ public class MffContext {

		/**
		* On older Android versions the Camera may need a SurfaceView to render into in order to
		* function. You may specify a dummy SurfaceView here if you do not want the context to
		* function. You may specify a placeholder SurfaceView here if you do not want the context to
		* create its own view. Note, that your view may or may not be used. You cannot rely on
		* your dummy view to be used by the Camera. If you pass null, no dummy view will be used.
		* your placeholder view to be used by the Camera. If you pass null, no placeholder view will be used.
		* In this case your application may not run correctly on older devices if you use the
		* camera. This flag has no effect if you do not require the camera.
		*/
		@@ -104,7 +104,7 @@ public class MffContext {
		/** The current context state. */
		private State mState = new State();

		/** A dummy SurfaceView that is required for Camera operation on older devices. */
		/** A placeholder SurfaceView that is required for Camera operation on older devices. */
		private SurfaceView mDummySurfaceView = null;

		/** Handler to execute code in the context's thread, such as issuing callbacks. */
		@@ -126,7 +126,7 @@ public class MffContext {
		* multiple MffContexts, however data between them cannot be shared. The context must be
		* created in a thread with a Looper (such as the main/UI thread).
		*
		* On older versions of Android, the MffContext may create a visible dummy view for the
		* On older versions of Android, the MffContext may create a visible placeholder view for the
		* camera to render into. This is a 1x1 SurfaceView that is placed into the top-left corner.
		*
		* @param context The application context to attach the MffContext to.
		@@ -142,7 +142,7 @@ public class MffContext {
		* multiple MffContexts, however data between them cannot be shared. The context must be
		* created in a thread with a Looper (such as the main/UI thread).
		*
		* On older versions of Android, the MffContext may create a visible dummy view for the
		* On older versions of Android, the MffContext may create a visible placeholder view for the
		* camera to render into. This is a 1x1 SurfaceView that is placed into the top-left corner.
		* You may alternatively specify your own SurfaceView in the configuration.
		*