diff options
| author | 2019-09-16 21:46:48 +0000 | |
|---|---|---|
| committer | 2019-09-16 21:46:48 +0000 | |
| commit | 20ecb9aeda4a7a384d218f250cada0a967c075fe (patch) | |
| tree | 1cd1f211790605345d69dd372150fa3285a05452 | |
| parent | c336db8d9b91ce22d5a9324adbd558cc05003c67 (diff) | |
| parent | cd6c54ac921592f8cbfcd0b71bc8c42311daa067 (diff) | |
Merge "Camera: audio restriction API doc update"
| -rw-r--r-- | core/java/android/hardware/camera2/CameraDevice.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/CameraDevice.java b/core/java/android/hardware/camera2/CameraDevice.java index 1654a5449e34..fb1ece29a369 100644 --- a/core/java/android/hardware/camera2/CameraDevice.java +++ b/core/java/android/hardware/camera2/CameraDevice.java @@ -1252,7 +1252,9 @@ public abstract class CameraDevice implements AutoCloseable { * * <p>The mute mode is a system-wide setting. When multiple CameraDevice objects * are setting different modes, the system will pick a the mode that's union of - * all modes set by CameraDevice.</p> + * all modes set by CameraDevice. Applications can also use + * {@link #getCameraAudioRestriction} to query current system-wide camera + * mute mode in effect.</p> * * <p>The mute settings from this CameraDevice will be automatically removed when the * CameraDevice is closed or the application is disconnected from the camera.</p> @@ -1278,7 +1280,7 @@ public abstract class CameraDevice implements AutoCloseable { * <p>Application can use this method to retrieve the system-wide camera audio restriction * settings described in {@link #setCameraAudioRestriction}.</p> * - * @return The system-wide mute mode setting resulting from this call + * @return The current system-wide mute mode setting in effect * * @throws CameraAccessException if the camera device is no longer connected or has * encountered a fatal error |