diff options
| author | Peng Xu <pengxu@google.com> | 2017-07-14 23:19:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-14 23:19:52 +0000 |
| commit | 210276d95389992c6d13e23cda5cc9baa393bdcd (patch) | |
| tree | b2105ab2b723ef704aff1c1e01b662713c7e1706 /core/java/android | |
| parent | 151807c109e6665d2f86845308e1c35c6a9fa374 (diff) | |
| parent | 6c5ee3d8947066aba4c2224c07801c8668407e6e (diff) | |
Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am: 17e641dae5
am: 6c5ee3d894
Change-Id: If3d4bc3338c4baec3c79512140321b65e7ef949f
Diffstat (limited to 'core/java/android')
| -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) */ |