diff options
| author | 2021-06-15 16:45:49 +0000 | |
|---|---|---|
| committer | 2021-06-15 16:45:49 +0000 | |
| commit | c0d45c4a42e244f226c52d4e86814db6a7eb6bc4 (patch) | |
| tree | ce99c08ce0311553631318cc891f459328f2fa6f | |
| parent | e616b98e2600bda68f629f98c8b455903bf2b610 (diff) | |
| parent | 9d0f657ddcae6ee3c5b66ba8567c9de95bf1e2b0 (diff) | |
Merge "Clarify the video API "setZoom" ratio." am: 6cf21bae3b am: 9d0f657ddc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1737273
Change-Id: Ib914f83b7029d2a2ef3d9584175d2f96944956cd
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java | 6 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/InCallService.java | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 30403f416661..711a09071a7c 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -1757,11 +1757,13 @@ public abstract class Connection extends Conferenceable { public abstract void onSetDeviceOrientation(int rotation); /** - * Sets camera zoom ratio. + * Sets the camera zoom ratio. * <p> * Sent from the {@link InCallService} via {@link InCallService.VideoCall#setZoom(float)}. * - * @param value The camera zoom ratio. + * @param value The camera zoom ratio; for the current camera, should be a value in the + * range defined by + * {@link android.hardware.camera2.CameraCharacteristics#CONTROL_ZOOM_RATIO_RANGE}. */ public abstract void onSetZoom(float value); diff --git a/telecomm/java/android/telecom/InCallService.java b/telecomm/java/android/telecom/InCallService.java index f20ee7e56d05..c365648db8f8 100644 --- a/telecomm/java/android/telecom/InCallService.java +++ b/telecomm/java/android/telecom/InCallService.java @@ -764,11 +764,13 @@ public abstract class InCallService extends Service { public abstract void setDeviceOrientation(int rotation); /** - * Sets camera zoom ratio. + * Sets the camera zoom ratio. * <p> * Handled by {@link Connection.VideoProvider#onSetZoom(float)}. * - * @param value The camera zoom ratio. + * @param value The camera zoom ratio; for the current camera, should be a value in the + * range defined by + * {@link android.hardware.camera2.CameraCharacteristics#CONTROL_ZOOM_RATIO_RANGE}. */ public abstract void setZoom(float value); |