commit dd2b7ccabca65ba5b85d7837096227ec29552e8e
author Romain Guy <romainguy@google.com> Thu Apr 06 22:47:21 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 06 22:47:21 2017 +0000
tree f21ec90b96eb0a00484ef1fdf21b0379537b93d9
parent ef6c9b1d8bec693ae57919d0f95f54e7588957b5
parent 98e11587f2e9e19be728effcdbdfdbcd89353786

Merge "Rename getIntent() to getRenderIntent()" into oc-dev am: b2bb3bf268
am: 98e11587f2

Change-Id: Ic5c95f3f4f811a1f668ec6218371efd3fe169371

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 45d2e54..b801dbc 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -12858,7 +12858,7 @@
 
   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[]);

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 0bacb98..fef63be 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -13623,7 +13623,7 @@
 
   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[]);

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index ec1f261..0e68820 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -12908,7 +12908,7 @@
 
   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[]);

graphics/java/android/graphics/ColorSpace.java

diff --git a/graphics/java/android/graphics/ColorSpace.java b/graphics/java/android/graphics/ColorSpace.java
index e03dcf3..e61d467 100644
--- a/graphics/java/android/graphics/ColorSpace.java
+++ b/graphics/java/android/graphics/ColorSpace.java
@@ -3530,7 +3530,7 @@
          *
          * @see RenderIntent
          */
-        public RenderIntent getIntent() {
+        public RenderIntent getRenderIntent() {
             return mIntent;
         }