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 08e1b2d..8386e2b 100644 (file)
--- 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 02dca8b..62261a9 100644 (file)
--- 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 5d01e37..9364717 100644 (file)
--- 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 d69f67d..218b857 100644 (file)
--- 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;