Merge "Hide HdrCapabilities constructor." into nyc-dev am: c189934573

am: 993f685045

* commit '993f68504528cffd32b5ab06998ba4bd43c3203b':
  Hide HdrCapabilities constructor.

Change-Id: I19746caa1081f6e37b8c055b1c571618ec38b93b
This commit is contained in:
Hangyu Kuang
2016-05-18 00:49:39 +00:00
committed by android-build-merger
4 changed files with 3 additions and 3 deletions

View File

@@ -40968,7 +40968,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

@@ -43970,7 +43970,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

@@ -41048,7 +41048,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;