diff options
| author | 2017-04-06 22:48:12 +0000 | |
|---|---|---|
| committer | 2017-04-06 22:48:16 +0000 | |
| commit | 1c5557c25e70575737a6acfd84977e4f6a1d622b (patch) | |
| tree | 4627275d7e61f99059bb34af551f42b08b9975ef | |
| parent | 2b92010a25b55f3bc4735914980df3ec20903c6e (diff) | |
| parent | dd2b7ccabca65ba5b85d7837096227ec29552e8e (diff) | |
Merge "Merge "Rename getIntent() to getRenderIntent()" into oc-dev am: b2bb3bf268 am: 98e11587f2"
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | api/test-current.txt | 2 | ||||
| -rw-r--r-- | graphics/java/android/graphics/ColorSpace.java | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index 45d2e543bab7..b801dbc29e93 100644 --- a/api/current.txt +++ b/api/current.txt @@ -12858,7 +12858,7 @@ package android.graphics { public static class ColorSpace.Connector { method public android.graphics.ColorSpace getDestination(); - method public android.graphics.ColorSpace.RenderIntent getIntent(); + method public android.graphics.ColorSpace.RenderIntent getRenderIntent(); method public android.graphics.ColorSpace getSource(); method public float[] transform(float, float, float); method public float[] transform(float[]); diff --git a/api/system-current.txt b/api/system-current.txt index 0bacb98e62a9..fef63be36755 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -13623,7 +13623,7 @@ package android.graphics { public static class ColorSpace.Connector { method public android.graphics.ColorSpace getDestination(); - method public android.graphics.ColorSpace.RenderIntent getIntent(); + method public android.graphics.ColorSpace.RenderIntent getRenderIntent(); method public android.graphics.ColorSpace getSource(); method public float[] transform(float, float, float); method public float[] transform(float[]); diff --git a/api/test-current.txt b/api/test-current.txt index ec1f261a01dd..0e688205997f 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -12908,7 +12908,7 @@ package android.graphics { public static class ColorSpace.Connector { method public android.graphics.ColorSpace getDestination(); - method public android.graphics.ColorSpace.RenderIntent getIntent(); + method public android.graphics.ColorSpace.RenderIntent getRenderIntent(); method public android.graphics.ColorSpace getSource(); method public float[] transform(float, float, float); method public float[] transform(float[]); diff --git a/graphics/java/android/graphics/ColorSpace.java b/graphics/java/android/graphics/ColorSpace.java index e03dcf34a40c..e61d46736364 100644 --- a/graphics/java/android/graphics/ColorSpace.java +++ b/graphics/java/android/graphics/ColorSpace.java @@ -3530,7 +3530,7 @@ public abstract class ColorSpace { * * @see RenderIntent */ - public RenderIntent getIntent() { + public RenderIntent getRenderIntent() { return mIntent; } |