diff options
| author | Peng Xu <pengxu@google.com> | 2017-07-14 23:07:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-14 23:07:11 +0000 |
| commit | 6c5ee3d8947066aba4c2224c07801c8668407e6e (patch) | |
| tree | ba0d8a1c89281ab448d040020bc993539e4d565b /core/java | |
| parent | 811fa6d001094edf31cc47a0110560cdf565f114 (diff) | |
| parent | 17e641dae58f0ef2745d4ec85baaf42e0b050f3a (diff) | |
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev
am: 17e641dae5
Change-Id: I3689c95bb249a77e6736f66e23065474a0916b9f
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/hardware/SensorManager.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/hardware/SensorManager.java b/core/java/android/hardware/SensorManager.java index 4bc62b1d04d3..e1cd451ba2a8 100644 --- a/core/java/android/hardware/SensorManager.java +++ b/core/java/android/hardware/SensorManager.java @@ -894,8 +894,9 @@ public abstract class SensorManager { * to free up resource in sensor system associated with the direct channel. * * @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 UncheckedIOException if not able to create channel. * @see SensorDirectChannel#close() * @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. * * @param mem A {@link android.hardware.HardwareBuffer} 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 UncheckedIOException if not able to create channel. * @see SensorDirectChannel#close() * @see #configureDirectChannel(SensorDirectChannel, Sensor, int) */ |