diff options
author | 2019-01-29 13:58:29 -0800 | |
---|---|---|
committer | 2019-01-29 13:58:29 -0800 | |
commit | e0a3eb90d902681f235c4a3da36b59ac8d0fbf31 (patch) | |
tree | 87d4d3be93a574fac96eb92d5bc7bb8ff1f0d960 | |
parent | d20bdb915a05704a6a869d6c1a1d07cb5e7bfff9 (diff) |
Add IntRange and FloatRange annotations
Bug: 123223163
Test: Build
Change-Id: I17f27075007df642ec93e5b762b0717da4a1e927
-rwxr-xr-x | api/current.txt | 4 | ||||
-rw-r--r-- | telecomm/java/android/telecom/VideoProfile.java | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index bb400567fa6e..f44b37071fed 100755 --- a/api/current.txt +++ b/api/current.txt @@ -41956,8 +41956,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(); diff --git a/telecomm/java/android/telecom/VideoProfile.java b/telecomm/java/android/telecom/VideoProfile.java index 7b2306128b7b..157f12c9f105 100644 --- a/telecomm/java/android/telecom/VideoProfile.java +++ b/telecomm/java/android/telecom/VideoProfile.java @@ -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; |