Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c3084c3 authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "Add IntRange and FloatRange annotations" am: 94a93772 

am: 74798a77

Change-Id: I6353003144e4c2cf5882d20d2d37921dc69b4bcf
parents 3b58fcd3 74798a77

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -41957,8 +41957,8 @@ 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);













    ctor public VideoProfile.CameraCapabilities(@IntRange(from=0) int, @IntRange(from=0) int);













    ctor public VideoProfile.CameraCapabilities(@IntRange(from=0) int, @IntRange(from=0) int, boolean, @FloatRange(from=1.0f) float);















    method public int describeContents();















    method public int getHeight();















    method public float getMaxZoom();

























telecomm/java/android/telecom/VideoProfile.java



+5
−2




























Original line number
Diff line number
Diff line








@@ -16,7 +16,9 @@





























package android.telecom;





























import android.annotation.FloatRange;















import android.annotation.IntDef;













import android.annotation.IntRange;















import android.annotation.UnsupportedAppUsage;















import android.os.Parcel;















import android.os.Parcelable;










@@ -364,7 +366,7 @@ public class VideoProfile implements Parcelable {













         * @param width The width of the camera video (in pixels).















         * @param height The height of the camera video (in pixels).















         */













        public CameraCapabilities(int width, int height) {













        public CameraCapabilities(@IntRange(from = 0) int width, @IntRange(from = 0) int height) {















            this(width, height, false, 1.0f);















        }

























@@ -376,7 +378,8 @@ public class VideoProfile implements Parcelable {













         * @param zoomSupported True when camera supports zoom.















         * @param maxZoom Maximum zoom supported by camera.















         */













        public CameraCapabilities(int width, int height, boolean zoomSupported, float maxZoom) {













        public CameraCapabilities(@IntRange(from = 0) int width,  @IntRange(from = 0) int height,













                                   boolean zoomSupported,  @FloatRange(from = 1.0f) float maxZoom) {















            mWidth = width;















            mHeight = height;















            mZoomSupported = zoomSupported;