diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-02-18 14:36:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-02-18 14:36:55 +0000 |
| commit | ffdc325ff2193f6c285221ef0dc979f29606d61b (patch) | |
| tree | 6a98d98795fc25491b234283ef6e09076230bccb /core/java/android | |
| parent | e4f26ef212666a2d605261026d36c30a339f2bbf (diff) | |
| parent | 8a08a922e5362c906ca87b9b89177ee2c83425e0 (diff) | |
Merge "Update color display javadoc"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/hardware/display/ColorDisplayManager.java | 3 | ||||
| -rw-r--r-- | core/java/android/hardware/display/DisplayManager.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/hardware/display/ColorDisplayManager.java b/core/java/android/hardware/display/ColorDisplayManager.java index f413d7cc92af..0c07a67e917d 100644 --- a/core/java/android/hardware/display/ColorDisplayManager.java +++ b/core/java/android/hardware/display/ColorDisplayManager.java @@ -65,7 +65,8 @@ public final class ColorDisplayManager { @SystemApi public static final int CAPABILITY_NONE = 0x0; /** - * The device can properly apply transforms over protected content. + * The device can use GPU composition on protected content (layers whose buffers are protected + * in the trusted memory zone). * * @hide */ diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java index 44b653c314ad..8a0a9c7c9d9d 100644 --- a/core/java/android/hardware/display/DisplayManager.java +++ b/core/java/android/hardware/display/DisplayManager.java @@ -563,7 +563,8 @@ public final class DisplayManager { * 0 produces a grayscale image, 1 is normal. * * @hide - * @deprecated use {@link ColorDisplayManager#setSaturationLevel(int)}. + * @deprecated use {@link ColorDisplayManager#setSaturationLevel(int)} instead. The level passed + * as a parameter here will be rounded to the nearest hundredth. */ @SystemApi @RequiresPermission(Manifest.permission.CONTROL_DISPLAY_SATURATION) |