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

Merge "Hide HdrCapabilities constructor." into nyc-dev

Browse Source 
am: c189934573

* commit 'c1899345730ab3c4504cb314b371b4fa43ca0702':
  Hide HdrCapabilities constructor.

Change-Id: Id3e15f6d3f26634dc632caa8f775071516436cd5
This commit is contained in:
Hangyu Kuang
2016-05-18 00:46:35 +00:00
committed by android-build-merger
parent e48384c867 c189934573
commit 993f685045
4 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

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

1
api/system-current.txt
View File

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

1
api/test-current.txt
View File

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

3
core/java/android/view/Display.java
View File

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