Merge "Correcting spelling errors in logs and comments." am: 115df20969 am:... (9888523c) · Commits · e / os / android_frameworks_base

core/java/android/hardware/SensorAdditionalInfo.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ public class SensorAdditionalInfo {
		public final int[] intValues;

		/**
		* Typical values of additional infomation type. The set of values is subject to extension in
		* Typical values of additional information type. The set of values is subject to extension in
		* newer versions and vendors have the freedom of define their own custom values.
		*
		* @hide

core/java/android/hardware/SensorManager.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -893,9 +893,9 @@ public abstract class SensorManager {

		/**
		* Flushes the FIFO of all the sensors registered for this listener. If there are events
		* in the FIFO of the sensor, they are returned as if the maxReportLantecy of the FIFO has
		* in the FIFO of the sensor, they are returned as if the maxReportLatency of the FIFO has
		* expired. Events are returned in the usual way through the SensorEventListener.
		* This call doesn't affect the maxReportLantecy for this sensor. This call is asynchronous and
		* This call doesn't affect the maxReportLatency for this sensor. This call is asynchronous and
		* returns immediately.
		* {@link android.hardware.SensorEventListener2#onFlushCompleted onFlushCompleted} is called
		* after all the events in the batch at the time of calling this method have been delivered
		@@ -923,7 +923,7 @@ public abstract class SensorManager {
		* Create a sensor direct channel backed by shared memory wrapped in MemoryFile object.
		*
		* The resulting channel can be used for delivering sensor events to native code, other
		* processes, GPU/DSP or other co-processors without CPU intervention. This is the recommanded
		* processes, GPU/DSP or other co-processors without CPU intervention. This is the recommended
		* for high performance sensor applications that use high sensor rates (e.g. greater than 200Hz)
		* and cares about sensor event latency.
		*
		@@ -945,7 +945,7 @@ public abstract class SensorManager {
		* Create a sensor direct channel backed by shared memory wrapped in HardwareBuffer object.
		*
		* The resulting channel can be used for delivering sensor events to native code, other
		* processes, GPU/DSP or other co-processors without CPU intervention. This is the recommanded
		* processes, GPU/DSP or other co-processors without CPU intervention. This is the recommended
		* for high performance sensor applications that use high sensor rates (e.g. greater than 200Hz)
		* and cares about sensor event latency.
		*
		@@ -1355,11 +1355,11 @@ public abstract class SensorManager {
		* returned by {@link #getRotationMatrix}.
		*
		* @param X
		* defines the axis of the new cooridinate system that coincide with the X axis of the
		* defines the axis of the new coordinate system that coincide with the X axis of the
		* original coordinate system.
		*
		* @param Y
		* defines the axis of the new cooridinate system that coincide with the Y axis of the
		* defines the axis of the new coordinate system that coincide with the Y axis of the
		* original coordinate system.
		*
		* @param outR
		@@ -1847,7 +1847,7 @@ public abstract class SensorManager {
		* This method is used to inject raw sensor data into the HAL. Call {@link
		* initDataInjection(boolean)} before this method to set the HAL in data injection mode. This
		* method should be called only if a previous call to initDataInjection has been successful and
		* the HAL and SensorService are already opreating in data injection mode.
		* the HAL and SensorService are already operating in data injection mode.
		*
		* @param sensor The sensor to inject.
		* @param values Sensor values to inject. The length of this

core/java/android/hardware/SystemSensorManager.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -565,7 +565,7 @@ public class SystemSensorManager extends SensorManager {
		public void onReceive(Context context, Intent intent) {
		if (intent.getAction().equals(Intent.ACTION_DYNAMIC_SENSOR_CHANGED)) {
		if (DEBUG_DYNAMIC_SENSOR) {
		Log.i(TAG, "DYNS received DYNAMIC_SENSOR_CHANED broadcast");
		Log.i(TAG, "DYNS received DYNAMIC_SENSOR_CHANGED broadcast");
		}
		// Dynamic sensors probably changed
		mDynamicSensorListDirty = true;
		@@ -610,7 +610,7 @@ public class SystemSensorManager extends SensorManager {
		protected void unregisterDynamicSensorCallbackImpl(
		DynamicSensorCallback callback) {
		if (DEBUG_DYNAMIC_SENSOR) {
		Log.i(TAG, "Removing dynamic sensor listerner");
		Log.i(TAG, "Removing dynamic sensor listener");
		}
		mDynamicSensorCallbacks.remove(callback);
		}
		@@ -740,7 +740,7 @@ public class SystemSensorManager extends SensorManager {
		}
		if (hardwareBuffer.getWidth() < MIN_DIRECT_CHANNEL_BUFFER_SIZE) {
		throw new IllegalArgumentException(
		"Width if HaradwareBuffer must be greater than "
		"Width if HardwareBuffer must be greater than "
		+ MIN_DIRECT_CHANNEL_BUFFER_SIZE);
		}
		if ((hardwareBuffer.getUsage() & HardwareBuffer.USAGE_SENSOR_DIRECT_DATA) == 0) {
		@@ -771,7 +771,7 @@ public class SystemSensorManager extends SensorManager {

		/*
		* BaseEventQueue is the communication channel with the sensor service,
		* SensorEventQueue, TriggerEventQueue are subclases and there is one-to-one mapping between
		* SensorEventQueue, TriggerEventQueue are subclasses and there is one-to-one mapping between
		* the queues and the listeners. InjectEventQueue is also a sub-class which is a special case
		* where data is being injected into the sensor HAL through the sensor service. It is not
		* associated with any listener and there is one InjectEventQueue associated with a