Merge "Revert "Release bitmap reference right after Per85ComputeTask done its job."" into qt-dev

am: 9aab7ae143 Change-Id: I0bf798bc8443d23455570b63ec6478a83f4ce34b
2019-04-10 09:30:28 -07:00
parent 5ec35e9731 9aab7ae143
commit f24cca08c9
1 changed files with 1 additions and 3 deletions
--- a/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageProcessHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageProcessHelper.java
@@ -85,9 +85,7 @@ class ImageProcessHelper {
            Bitmap bitmap = bitmaps[0];
            if (bitmap != null) {
                int[] histogram = processHistogram(bitmap);
-                Float val = computePercentile85(bitmap, histogram);
-                bitmaps[0] = null;
-                return val;
+                return computePercentile85(bitmap, histogram);
            }
            Log.e(TAG, "Per85ComputeTask: Can't get bitmap");
            return DEFAULT_PER85;