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

Commit 6c5ee3d8 authored by Peng Xu's avatar Peng Xu Committed by android-build-merger
Browse files

Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev 

am: 17e641da

Change-Id: I3689c95bb249a77e6736f66e23065474a0916b9f
parents 811fa6d0 17e641da

core/java/android/hardware/SensorManager.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -894,8 +894,9 @@ public abstract class SensorManager { 
     * to free up resource in sensor system associated with the direct channel.

     * to free up resource in sensor system associated with the direct channel.

     *

     *

     * @param mem A {@link android.os.MemoryFile} shared memory object.

     * @param mem A {@link android.os.MemoryFile} shared memory object.

     * @return A {@link android.hardware.SensorDirectChannel} object if successful, null otherwise.

     * @return A {@link android.hardware.SensorDirectChannel} object.

     * @throws NullPointerException when mem is null.

     * @throws NullPointerException when mem is null.

     * @throws UncheckedIOException if not able to create channel.

     * @see SensorDirectChannel#close()

     * @see SensorDirectChannel#close()

     * @see #configureDirectChannel(SensorDirectChannel, Sensor, int)

     * @see #configureDirectChannel(SensorDirectChannel, Sensor, int)

     */

     */
@@ -916,9 +917,9 @@ public abstract class SensorManager { 
     * to free up resource in sensor system associated with the direct channel.

     * to free up resource in sensor system associated with the direct channel.

     *

     *

     * @param mem A {@link android.hardware.HardwareBuffer} shared memory object.

     * @param mem A {@link android.hardware.HardwareBuffer} shared memory object.

     * @return A {@link android.hardware.SensorDirectChannel} object if successful,

     * @return A {@link android.hardware.SensorDirectChannel} object.

     *         null otherwise.

     * @throws NullPointerException when mem is null.

     * @throws NullPointerException when mem is null.

     * @throws UncheckedIOException if not able to create channel.

     * @see SensorDirectChannel#close()

     * @see SensorDirectChannel#close()

     * @see #configureDirectChannel(SensorDirectChannel, Sensor, int)

     * @see #configureDirectChannel(SensorDirectChannel, Sensor, int)

     */

     */