From f04468806fc4a83ee6b37bacd0ca57978725e018 Mon Sep 17 00:00:00 2001 From: Wu Ahan Date: Wed, 10 Apr 2019 07:41:33 +0000 Subject: [PATCH] Revert "Release bitmap reference right after Per85ComputeTask done its job." This reverts commit 1e0e143c40a83580b5ced3ee28407119c1acb217. Reason for revert: ART remove preloaded classes in ag/6987683 to prevent AsyncTask leakage. 1. android.content.AsyncTaskLoader$LoadTask 2. android.speech.tts.TextToSpeech$Connection$SetupConnectionAsyncTask Bug: 124127996 Bug: 130206915 Test: Obtain CL ag/6987683 in local test environment. Test: run "atest android.app.cts.WallpaperManagerTest". Test: Observe AsyncTask do not cause bitmap object leak anymore. Change-Id: I358756366fd9a08bbdd51e09f21fccafee7ad311 --- .../com/android/systemui/glwallpaper/ImageProcessHelper.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageProcessHelper.java b/packages/SystemUI/src/com/android/systemui/glwallpaper/ImageProcessHelper.java index d1939d0fddb0b..477e7d7ebf72f 100644 --- 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;