From 16d2ddd830c99c5bd4cde57f17c256dc1e10812e Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Tue, 27 Apr 2021 18:26:11 +0000
Subject: [PATCH] libhwui: AnimatedImageThread fix 'UAF' nits

nits from UAF CL:
- we don't need to be careful about destroying this thread
- overly verbose return

Bug: 186468053
Test: N/A
Change-Id: I96b3c5b038529341381865cbd5784ac54ba2fc9e
---
 libs/hwui/hwui/AnimatedImageThread.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/hwui/hwui/AnimatedImageThread.cpp b/libs/hwui/hwui/AnimatedImageThread.cpp
index 3d5841d308fb7..825dd4cf2bf12 100644
--- a/libs/hwui/hwui/AnimatedImageThread.cpp
+++ b/libs/hwui/hwui/AnimatedImageThread.cpp
@@ -22,12 +22,12 @@ namespace android {
 namespace uirenderer {
 
 AnimatedImageThread& AnimatedImageThread::getInstance() {
-    [[clang::no_destroy]] static sp<AnimatedImageThread> sInstance = []() {
+    static sp<AnimatedImageThread> sInstance = []() {
         sp<AnimatedImageThread> thread = sp<AnimatedImageThread>::make();
         thread->start("AnimatedImageThread");
         return thread;
     }();
-    return *sInstance.get();
+    return *sInstance;
 }
 
 AnimatedImageThread::AnimatedImageThread() {