From: Romain Guy <romainguy@google.com>
Date: Mon, 3 Apr 2017 18:49:20 +0000 (-0700)
Subject: Make Color non-final because apps break...
X-Git-Tag: android-x86-9.0-r1~1044^2~2373^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bae8b52c71766ea1a6e59382f8b76e2013f358f9;p=android-x86%2Fframeworks-base.git

Make Color non-final because apps break...

Bug: 36858735
Test: Manual run of crashing app
Change-Id: I3eb06260074ee6950bc91731e7093a26d7e32b49
---

diff --git a/api/current.txt b/api/current.txt
index 08e1b2db144f..8386e2b6f7bd 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -12702,7 +12702,7 @@ package android.graphics {
     enum_constant public static final android.graphics.Canvas.VertexMode TRIANGLE_STRIP;
   }
 
-  public final class Color {
+  public class Color {
     ctor public Color();
     method public static int HSVToColor(float[]);
     method public static int HSVToColor(int, float[]);
diff --git a/api/system-current.txt b/api/system-current.txt
index 02dca8b327f4..62261a90cc4b 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -13431,7 +13431,7 @@ package android.graphics {
     enum_constant public static final android.graphics.Canvas.VertexMode TRIANGLE_STRIP;
   }
 
-  public final class Color {
+  public class Color {
     ctor public Color();
     method public static int HSVToColor(float[]);
     method public static int HSVToColor(int, float[]);
diff --git a/api/test-current.txt b/api/test-current.txt
index 5d01e37a6e71..9364717b9022 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -12752,7 +12752,7 @@ package android.graphics {
     enum_constant public static final android.graphics.Canvas.VertexMode TRIANGLE_STRIP;
   }
 
-  public final class Color {
+  public class Color {
     ctor public Color();
     method public static int HSVToColor(float[]);
     method public static int HSVToColor(int, float[]);
diff --git a/graphics/java/android/graphics/Color.java b/graphics/java/android/graphics/Color.java
index d69f67d138a1..218b857ce83c 100644
--- a/graphics/java/android/graphics/Color.java
+++ b/graphics/java/android/graphics/Color.java
@@ -289,7 +289,7 @@ import java.util.function.DoubleUnaryOperator;
  * and <code>(1.0, 0.0, 0.0, 0.5)</code>.</p>
  */
 @AnyThread
-public final class Color {
+public class Color {
     @ColorInt public static final int BLACK       = 0xFF000000;
     @ColorInt public static final int DKGRAY      = 0xFF444444;
     @ColorInt public static final int GRAY        = 0xFF888888;