Adding video width/height to camera capabilities. (5d231e13) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −1

Original line number	Diff line number	Diff line
		@@ -28594,9 +28594,11 @@ package android.telecomm {
		}

		public final class CallCameraCapabilities implements android.os.Parcelable {
		ctor public CallCameraCapabilities(boolean, float);
		ctor public CallCameraCapabilities(boolean, float, int, int);
		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 CREATOR;

telecomm/java/android/telecomm/CallCameraCapabilities.java

+34 −3

Original line number	Diff line number	Diff line
		@@ -35,15 +35,29 @@ public final class CallCameraCapabilities implements Parcelable {
		*/
		private final float mMaxZoom;

		/**
		* The width of the camera video in pixels.
		*/
		private final int mWidth;

		/**
		* The height of the camera video in pixels.
		*/
		private final int mHeight;

		/**
		* Create a call camera capabilities instance.
		*
		* @param zoomSupported True when camera supports zoom.
		* @param maxZoom Maximum zoom supported by camera.
		* @param width The width of the camera video (in pixels).
		* @param height The height of the camera video (in pixels).
		*/
		public CallCameraCapabilities(boolean zoomSupported, float maxZoom) {
		public CallCameraCapabilities(boolean zoomSupported, float maxZoom, int width, int height) {
		mZoomSupported = zoomSupported;
		mMaxZoom = maxZoom;
		mWidth = width;
		mHeight = height;
		}

		/**
		@@ -61,8 +75,10 @@ public final class CallCameraCapabilities implements Parcelable {
		public CallCameraCapabilities createFromParcel(Parcel source) {
		boolean supportsZoom = source.readByte() != 0;
		float maxZoom = source.readFloat();
		int width = source.readInt();
		int height = source.readInt();

		return new CallCameraCapabilities(supportsZoom, maxZoom);
		return new CallCameraCapabilities(supportsZoom, maxZoom, width, height);
		}

		@Override
		@@ -94,7 +110,8 @@ public final class CallCameraCapabilities implements Parcelable {
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeByte((byte) (isZoomSupported() ? 1 : 0));
		dest.writeFloat(getMaxZoom());

		dest.writeInt(getWidth());
		dest.writeInt(getHeight());
		}

		/**
		@@ -110,4 +127,18 @@ public final class CallCameraCapabilities implements Parcelable {
		public float getMaxZoom() {
		return mMaxZoom;
		}

		/**
		* The width of the camera video in pixels.
		*/
		public int getWidth() {
		return mWidth;
		}

		/**
		* The height of the camera video in pixels.
		*/
		public int getHeight() {
		return mHeight;
		}
		}