Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Correcting spelling errors in logs and comments." am: 115df20969 am: 0d3d492a6e

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

Change-Id: Ice9f8b3ddf240fea9df2ad91eb26d2dbb33bf473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-01 17:51:32 +00:00
committed by Automerger Merge Worker
parent 71217314bc 0d3d492a6e
commit bbfd1212bc
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/hardware/SensorAdditionalInfo.java
View File

@@ -63,7 +63,7 @@ public class SensorAdditionalInfo {
public final int[] intValues; 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. * newer versions and vendors have the freedom of define their own custom values.
* *
* @hide * @hide

14
core/java/android/hardware/SensorManager.java
View File

@@ -872,9 +872,9 @@ public abstract class SensorManager {
/** /**
* Flushes the FIFO of all the sensors registered for this listener. If there are events * 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. * 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. * returns immediately.
* {@link android.hardware.SensorEventListener2#onFlushCompleted onFlushCompleted} is called * {@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 * after all the events in the batch at the time of calling this method have been delivered
@@ -902,7 +902,7 @@ public abstract class SensorManager {
* Create a sensor direct channel backed by shared memory wrapped in MemoryFile object. * 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 * 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) * for high performance sensor applications that use high sensor rates (e.g. greater than 200Hz)
* and cares about sensor event latency. * and cares about sensor event latency.
* *
@@ -924,7 +924,7 @@ public abstract class SensorManager {
* Create a sensor direct channel backed by shared memory wrapped in HardwareBuffer object. * 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 * 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) * for high performance sensor applications that use high sensor rates (e.g. greater than 200Hz)
* and cares about sensor event latency. * and cares about sensor event latency.
* *
@@ -1334,11 +1334,11 @@ public abstract class SensorManager {
* returned by {@link #getRotationMatrix}. * returned by {@link #getRotationMatrix}.
* *
* @param X * @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. * original coordinate system.
* *
* @param Y * @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. * original coordinate system.
* *
* @param outR * @param outR
@@ -1826,7 +1826,7 @@ public abstract class SensorManager {
* This method is used to inject raw sensor data into the HAL. Call {@link * 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 * 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 * 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 sensor The sensor to inject.
* @param values Sensor values to inject. The length of this * @param values Sensor values to inject. The length of this

8
core/java/android/hardware/SystemSensorManager.java
View File

@@ -453,7 +453,7 @@ public class SystemSensorManager extends SensorManager {
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
if (intent.getAction() == Intent.ACTION_DYNAMIC_SENSOR_CHANGED) { if (intent.getAction() == Intent.ACTION_DYNAMIC_SENSOR_CHANGED) {
if (DEBUG_DYNAMIC_SENSOR) { 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 // Dynamic sensors probably changed
mDynamicSensorListDirty = true; mDynamicSensorListDirty = true;
@@ -498,7 +498,7 @@ public class SystemSensorManager extends SensorManager {
protected void unregisterDynamicSensorCallbackImpl( protected void unregisterDynamicSensorCallbackImpl(
DynamicSensorCallback callback) { DynamicSensorCallback callback) {
if (DEBUG_DYNAMIC_SENSOR) { if (DEBUG_DYNAMIC_SENSOR) {
Log.i(TAG, "Removing dynamic sensor listerner"); Log.i(TAG, "Removing dynamic sensor listener");
} }
mDynamicSensorCallbacks.remove(callback); mDynamicSensorCallbacks.remove(callback);
} }
@@ -624,7 +624,7 @@ public class SystemSensorManager extends SensorManager {
} }
if (hardwareBuffer.getWidth() < MIN_DIRECT_CHANNEL_BUFFER_SIZE) { if (hardwareBuffer.getWidth() < MIN_DIRECT_CHANNEL_BUFFER_SIZE) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"Width if HaradwareBuffer must be greater than " "Width if HardwareBuffer must be greater than "
+ MIN_DIRECT_CHANNEL_BUFFER_SIZE); + MIN_DIRECT_CHANNEL_BUFFER_SIZE);
} }
if ((hardwareBuffer.getUsage() & HardwareBuffer.USAGE_SENSOR_DIRECT_DATA) == 0) { if ((hardwareBuffer.getUsage() & HardwareBuffer.USAGE_SENSOR_DIRECT_DATA) == 0) {
@@ -655,7 +655,7 @@ public class SystemSensorManager extends SensorManager {
/* /*
* BaseEventQueue is the communication channel with the sensor service, * 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 * 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 * 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 * associated with any listener and there is one InjectEventQueue associated with a