Merge "public API for VideoProfile.CameraCapability with zoom" am: 610673690c (fcd87384) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}

+3 −8

Original line number	Diff line number	Diff line
		@@ -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;