Merge "Revert "WallpaperColors hint computation"" into pi-dev

am: cf2c35dca6

Change-Id: Ibc3760ce650c8d48f261e6486edb51582391b710

1 files changed, 1 insertions, 8 deletions

diff --git a/core/java/android/app/WallpaperColors.java b/core/java/android/app/WallpaperColors.java
index 2d007adf86e6..60e8a121dc45 100644
--- a/core/java/android/app/WallpaperColors.java
+++ b/core/java/android/app/WallpaperColors.java
@@ -144,13 +144,6 @@ public final class WallpaperColors implements Parcelable {
      * @param bitmap Source where to extract from.
      */
     public static WallpaperColors fromBitmap(@NonNull Bitmap bitmap) {
-        return fromBitmap(bitmap, false /* computeHints */);
-    }
-
-    /**
-     * @hide
-     */
-    public static WallpaperColors fromBitmap(@NonNull Bitmap bitmap, boolean computeHints) {
         if (bitmap == null) {
             throw new IllegalArgumentException("Bitmap can't be null");
         }
@@ -200,7 +193,7 @@ public final class WallpaperColors implements Parcelable {
             }
         }
 
-        int hints = computeHints ? calculateDarkHints(bitmap) : 0;
+        int hints = calculateDarkHints(bitmap);
 
         if (shouldRecycle) {
             bitmap.recycle();