Merge "Hide HdrCapabilities constructor." into nyc-dev

This commit is contained in:
Hangyu Kuang
2016-05-18 00:42:54 +00:00
committed by Android (Google) Code Review
4 changed files with 3 additions and 3 deletions

View File

@@ -40826,7 +40826,6 @@ package android.view {
}
public static final class Display.HdrCapabilities implements android.os.Parcelable {
ctor public Display.HdrCapabilities(int[], float, float, float);
method public int describeContents();
method public float getDesiredMaxAverageLuminance();
method public float getDesiredMaxLuminance();

View File

@@ -43828,7 +43828,6 @@ package android.view {
}
public static final class Display.HdrCapabilities implements android.os.Parcelable {
ctor public Display.HdrCapabilities(int[], float, float, float);
method public int describeContents();
method public float getDesiredMaxAverageLuminance();
method public float getDesiredMaxLuminance();

View File

@@ -40905,7 +40905,6 @@ package android.view {
}
public static final class Display.HdrCapabilities implements android.os.Parcelable {
ctor public Display.HdrCapabilities(int[], float, float, float);
method public int describeContents();
method public float getDesiredMaxAverageLuminance();
method public float getDesiredMaxLuminance();

View File

@@ -1168,6 +1168,9 @@ public final class Display {
public HdrCapabilities() {
}
/**
* @hide
*/
public HdrCapabilities(int[] supportedHdrTypes, float maxLuminance,
float maxAverageLuminance, float minLuminance) {
mSupportedHdrTypes = supportedHdrTypes;