summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xapi/current.txt3
-rw-r--r--telecomm/java/android/telecom/VideoProfile.java11
2 files changed, 6 insertions, 8 deletions
diff --git a/api/current.txt b/api/current.txt
index 7b48a5b60dc3..d497c54c21c1 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -41934,9 +41934,12 @@ package android.telecom {
public static final class VideoProfile.CameraCapabilities implements android.os.Parcelable {
ctor public VideoProfile.CameraCapabilities(int, int);
+ ctor public VideoProfile.CameraCapabilities(int, int, boolean, float);
method public int describeContents();
method public int getHeight();
+ method public float getMaxZoom();
method public int getWidth();
+ method public boolean isZoomSupported();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.telecom.VideoProfile.CameraCapabilities> CREATOR;
}
diff --git a/telecomm/java/android/telecom/VideoProfile.java b/telecomm/java/android/telecom/VideoProfile.java
index bbac8eb88aec..7b2306128b7b 100644
--- a/telecomm/java/android/telecom/VideoProfile.java
+++ b/telecomm/java/android/telecom/VideoProfile.java
@@ -369,16 +369,13 @@ public class VideoProfile implements Parcelable {
}
/**
- * Create a call camera capabilities instance that optionally
- * supports zoom.
+ * Create a call camera capabilities instance that optionally supports zoom.
*
* @param width The width of the camera video (in pixels).
* @param height The height of the camera video (in pixels).
* @param zoomSupported True when camera supports zoom.
* @param maxZoom Maximum zoom supported by camera.
- * @hide
*/
- @UnsupportedAppUsage
public CameraCapabilities(int width, int height, boolean zoomSupported, float maxZoom) {
mWidth = width;
mHeight = height;
@@ -455,16 +452,14 @@ public class VideoProfile implements Parcelable {
}
/**
- * Whether the camera supports zoom.
- * @hide
+ * Returns {@code true} is zoom is supported, {@code false} otherwise.
*/
public boolean isZoomSupported() {
return mZoomSupported;
}
/**
- * The maximum zoom supported by the camera.
- * @hide
+ * Returns the maximum zoom supported by the camera.
*/
public float getMaxZoom() {
return mMaxZoom;