diff options
| author | Daniel Norman <danielnorman@google.com> | 2021-02-12 15:55:55 -0800 |
|---|---|---|
| committer | Daniel Norman <danielnorman@google.com> | 2021-02-18 10:08:08 -0800 |
| commit | 1782479fd234d6fe1a3f29763f2a6b0063b3bab5 (patch) | |
| tree | 1231f063170df2fd5817dc4e874a50e3fb207791 /cmds/bootanimation/BootAnimation.cpp | |
| parent | 42996d279801e7562af0cd382fe54cc171214d99 (diff) | |
Stops calling AImageDecoder_delete to hide bootanim error.
This function calls ~ImageDecoder which segfaults.
Bug: 180130969
Change-Id: Iade6025580ccd882ccc140cec966372208804506
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index f51d1233eb95..6d23323c759c 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -178,7 +178,9 @@ static void* decodeImage(const void* encodedData, size_t dataLength, AndroidBitm const size_t size = outInfo->stride * outInfo->height; void* pixels = malloc(size); int result = AImageDecoder_decodeImage(decoder, pixels, outInfo->stride, size); - AImageDecoder_delete(decoder); + // TODO(b/180130969) Fix ~ImageDecoder() so that AImageDecoder_delete stops + // causing a segfault, then add back this call to AImageDecoder_delete(). + //AImageDecoder_delete(decoder); if (result != ANDROID_IMAGE_DECODER_SUCCESS) { free(pixels); |