commit 9a1bf53c4b0a45ac0072d26807b145ddcf044c28
author Steven Moreland <smoreland@google.com> Fri Apr 02 02:07:59 2021 +0000
committer Steven Moreland <smoreland@google.com> Mon Apr 19 22:01:35 2021 +0000
tree ac021bd525b8bbf39bad6997ee2bdebb24e14415
parent 3d98500375b5a96944175f0fb940fbfc37f3591e

libutils: disable implicit ref base construction

Ignore-AOSP-First: b/184196278

Bug: 184190315
Test: libutils_test
Change-Id: If47f79a8b96ee75706817081950f9ca5c0d12731

libutils/Looper.cpp

diff --git a/libutils/Looper.cpp b/libutils/Looper.cpp
index 14e3e35..4b01e5c 100644
--- a/libutils/Looper.cpp
+++ b/libutils/Looper.cpp
@@ -107,14 +107,15 @@
     int result = pthread_once(& gTLSOnce, initTLSKey);
     LOG_ALWAYS_FATAL_IF(result != 0, "pthread_once failed");
 
-    return (Looper*)pthread_getspecific(gTLSKey);
+    Looper* looper = (Looper*)pthread_getspecific(gTLSKey);
+    return sp<Looper>::fromExisting(looper);
 }
 
 sp<Looper> Looper::prepare(int opts) {
     bool allowNonCallbacks = opts & PREPARE_ALLOW_NON_CALLBACKS;
     sp<Looper> looper = Looper::getForThread();
     if (looper == nullptr) {
-        looper = new Looper(allowNonCallbacks);
+        looper = sp<Looper>::make(allowNonCallbacks);
         Looper::setForThread(looper);
     }
     if (looper->getAllowNonCallbacks() != allowNonCallbacks) {
@@ -424,7 +425,11 @@
 }
 
 int Looper::addFd(int fd, int ident, int events, Looper_callbackFunc callback, void* data) {
-    return addFd(fd, ident, events, callback ? new SimpleLooperCallback(callback) : nullptr, data);
+    sp<SimpleLooperCallback> looperCallback;
+    if (callback) {
+        looperCallback = sp<SimpleLooperCallback>::make(callback);
+    }
+    return addFd(fd, ident, events, looperCallback, data);
 }
 
 int Looper::addFd(int fd, int ident, int events, const sp<LooperCallback>& callback, void* data) {