Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c61e7fd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix documentation of heart beat sensor" am: 3bef7fe5 am: a3d54aaa... 

Merge "Fix documentation of heart beat sensor" am: 3bef7fe5 am: a3d54aaa am: 4807d991 am: 8570351c

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

Change-Id: Id274e65bade2dbafdf213f282bd7343bb9425d18
parents 142d9836 8570351c

core/java/android/hardware/Sensor.java

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ public final class Sensor { 
    public static final String STRING_TYPE_MOTION_DETECT = "android.sensor.motion_detect";



    /**

     * A constant describing a motion detect sensor.

     * A constant describing a heart beat sensor.

     *

     * See {@link android.hardware.SensorEvent#values SensorEvent.values} for more details.

     *

core/java/android/hardware/SensorEvent.java

+1 −1
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ public class SensorEvent { 
     *   <h4>{@link android.hardware.Sensor#TYPE_HEART_BEAT

     * Sensor.TYPE_HEART_BEAT}:</h4>

     *

     * A sensor of this type returns an event everytime a hear beat peak is

     * A sensor of this type returns an event everytime a heart beat peak is

     * detected.

     *

     * Peak here ideally corresponds to the positive peak in the QRS complex of