From b5e5053ebc442ced1ad702f551919bc533bee164 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Thu, 24 May 2018 16:33:14 +0000 Subject: [PATCH] Revert "WallpaperColors hint computation" This reverts commit c50f47d970b474371938f33e46b13ae2dd040df0. Fixes: 79465234 Reason for revert: Google still does it using private APIs and apps were relying on this behavior, not good for the ecosystem. Change-Id: I62e2b4cd1e6e562fcdd89c97e599bcdade83381a --- core/java/android/app/WallpaperColors.java | 9 +-------- .../server/wallpaper/WallpaperManagerService.java | 2 +- .../server/wallpaper/WallpaperServiceTests.java | 15 --------------- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/core/java/android/app/WallpaperColors.java b/core/java/android/app/WallpaperColors.java index f780703b57869..a2864b9d83af4 100644 --- a/core/java/android/app/WallpaperColors.java +++ b/core/java/android/app/WallpaperColors.java @@ -137,13 +137,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"); } @@ -193,7 +186,7 @@ public final class WallpaperColors implements Parcelable { } } - int hints = computeHints ? calculateDarkHints(bitmap) : 0; + int hints = calculateDarkHints(bitmap); if (shouldRecycle) { bitmap.recycle(); diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java index 8901b044047c3..397c50f949b98 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java @@ -458,7 +458,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub if (cropFile != null) { Bitmap bitmap = BitmapFactory.decodeFile(cropFile); if (bitmap != null) { - colors = WallpaperColors.fromBitmap(bitmap, true /* computeHints */); + colors = WallpaperColors.fromBitmap(bitmap); bitmap.recycle(); } } diff --git a/services/tests/servicestests/src/com/android/server/wallpaper/WallpaperServiceTests.java b/services/tests/servicestests/src/com/android/server/wallpaper/WallpaperServiceTests.java index 4d99b32087200..9c010a07135d4 100644 --- a/services/tests/servicestests/src/com/android/server/wallpaper/WallpaperServiceTests.java +++ b/services/tests/servicestests/src/com/android/server/wallpaper/WallpaperServiceTests.java @@ -20,8 +20,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import android.app.WallpaperColors; -import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; import android.os.Handler; import android.os.Message; import android.os.SystemClock; @@ -87,17 +85,4 @@ public class WallpaperServiceTests { assertEquals("OnComputeColors should have been deferred.", 0, eventCountdown.getCount()); } - - @Test - public void testFromDrawableTest_doesntComputeHints() { - WallpaperColors wallpaperColors = WallpaperColors.fromDrawable( - new ColorDrawable(Color.BLACK)); - assertEquals("WallpaperColors should not support dark theme.", 0, - wallpaperColors.getColorHints() & WallpaperColors.HINT_SUPPORTS_DARK_THEME); - - wallpaperColors = WallpaperColors.fromDrawable( - new ColorDrawable(Color.WHITE)); - assertEquals("WallpaperColors should not support dark text.", 0, - wallpaperColors.getColorHints() & WallpaperColors.HINT_SUPPORTS_DARK_TEXT); - } }