Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add IntRange and FloatRange annotations"

Browse Source 
am: 94a9377222

Change-Id: Iab472ad2c0ffe875069ea7b71ce10a14e9ef70f5
This commit is contained in:
Chen Xu
2019-01-29 16:32:21 -08:00
committed by android-build-merger
parent 22a8239b6a 94a9377222
commit 74798a771a
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -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();

7
telecomm/java/android/telecom/VideoProfile.java
View File

@@ -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;