Merge changes I60d42f38,I25857739 into main

* changes:
  Ensure Choreographer is held as sp<> in SurfaceControl.
  Harden construction sites of android::StrongPointer in frameworks/native

Author: Treehugger Robot

cmds/flatland/GLHelper.cpp

@@ -241,7 +241,7 @@ bool GLHelper::createWindowSurface(uint32_t w, uint32_t h,
     status_t err;
 
     if (mSurfaceComposerClient == nullptr) {
-        mSurfaceComposerClient = new SurfaceComposerClient;
+        mSurfaceComposerClient = sp<SurfaceComposerClient>::make();
     }
     err = mSurfaceComposerClient->initCheck();
     if (err != NO_ERROR) {

libs/gui/SurfaceControl.cpp

@@ -194,7 +194,7 @@ const std::string& SurfaceControl::getName() const {
     return mName;
 }
 
-std::shared_ptr<Choreographer> SurfaceControl::getChoreographer() {
+sp<Choreographer> SurfaceControl::getChoreographer() {
     if (mChoreographer) {
         return mChoreographer;
     }
@@ -203,7 +203,7 @@ std::shared_ptr<Choreographer> SurfaceControl::getChoreographer() {
         ALOGE("%s: No looper prepared for thread", __func__);
         return nullptr;
     }
-    mChoreographer = std::make_shared<Choreographer>(looper, getHandle());
+    mChoreographer = sp<Choreographer>::make(looper, getHandle());
     status_t result = mChoreographer->initialize();
     if (result != OK) {
         ALOGE("Failed to initialize choreographer");

libs/gui/include/gui/SurfaceControl.h

@@ -26,6 +26,7 @@
 
 #include <android/gui/ISurfaceComposerClient.h>
 
+#include <gui/Choreographer.h>
 #include <ui/FrameStats.h>
 #include <ui/PixelFormat.h>
 #include <ui/Region.h>
@@ -36,7 +37,6 @@ namespace android {
 
 // ---------------------------------------------------------------------------
 
-class Choreographer;
 class IGraphicBufferProducer;
 class Surface;
 class SurfaceComposerClient;
@@ -82,7 +82,7 @@ class SurfaceControl : public RefBase
     const std::string& getName() const;
 
     // TODO(b/267195698): Consider renaming.
-    std::shared_ptr<Choreographer> getChoreographer();
+    sp<Choreographer> getChoreographer();
 
     sp<IGraphicBufferProducer> getIGraphicBufferProducer();
 
@@ -134,7 +134,7 @@ class SurfaceControl : public RefBase
     PixelFormat mFormat = PIXEL_FORMAT_NONE;
     uint32_t mCreateFlags = 0;
     uint64_t mFallbackFrameNumber = 100;
-    std::shared_ptr<Choreographer> mChoreographer;
+    sp<Choreographer> mChoreographer;
 };
 
 }; // namespace android

libs/gui/tests/BLASTBufferQueue_test.cpp

@@ -201,7 +201,7 @@ class BLASTBufferQueueTest : public ::testing::Test {
 protected:
     void SetUp() {
         mComposer = ComposerService::getComposerService();
-        mClient = new SurfaceComposerClient();
+        mClient = sp<SurfaceComposerClient>::make();
         const auto ids = SurfaceComposerClient::getPhysicalDisplayIds();
         ASSERT_FALSE(ids.empty());
         // display 0 is picked as this test is not much display depedent

libs/gui/tests/DisplayedContentSampling_test.cpp

@@ -30,7 +30,7 @@ static constexpr uint32_t INVALID_MASK = 0x10;
 class DisplayedContentSamplingTest : public ::testing::Test {
 protected:
     void SetUp() {
-        mComposerClient = new SurfaceComposerClient;
+        mComposerClient = sp<SurfaceComposerClient>::make();
         ASSERT_EQ(OK, mComposerClient->initCheck());
         const auto ids = SurfaceComposerClient::getPhysicalDisplayIds();
         ASSERT_FALSE(ids.empty());

libs/gui/tests/EndToEndNativeInputTest.cpp

@@ -398,7 +398,7 @@ class InputSurfacesTest : public ::testing::Test {
     InputSurfacesTest() { ProcessState::self()->startThreadPool(); }
 
     void SetUp() {
-        mComposerClient = new SurfaceComposerClient;
+        mComposerClient = sp<SurfaceComposerClient>::make();
         ASSERT_EQ(NO_ERROR, mComposerClient->initCheck());
         const auto ids = SurfaceComposerClient::getPhysicalDisplayIds();
         ASSERT_FALSE(ids.empty());

libs/gui/tests/GLTest.cpp

@@ -56,7 +56,7 @@ void GLTest::SetUp() {
     }
 
     if (mDisplaySecs > 0) {
-        mComposerClient = new SurfaceComposerClient;
+        mComposerClient = sp<SurfaceComposerClient>::make();
         ASSERT_EQ(NO_ERROR, mComposerClient->initCheck());
 
         mSurfaceControl = mComposerClient->createSurface(

libs/gui/tests/RegionSampling_test.cpp

@@ -180,7 +180,7 @@ struct RegionSamplingTest : ::testing::Test {
     }
 
     void SetUp() override {
-        mSurfaceComposerClient = new SurfaceComposerClient;
+        mSurfaceComposerClient = sp<SurfaceComposerClient>::make();
         ASSERT_EQ(NO_ERROR, mSurfaceComposerClient->initCheck());
 
         mBackgroundLayer =

libs/gui/tests/SamplingDemo.cpp

@@ -36,7 +36,7 @@ namespace android {
 class Button : public gui::BnRegionSamplingListener {
 public:
     Button(const char* name, const Rect& samplingArea) {
-        sp<SurfaceComposerClient> client = new SurfaceComposerClient;
+        sp<SurfaceComposerClient> client = sp<SurfaceComposerClient>::make();
 
         mButton = client->createSurface(String8(name), 0, 0, PIXEL_FORMAT_RGBA_8888,
                                         ISurfaceComposerClient::eFXSurfaceEffect);

libs/gui/tests/Surface_test.cpp

@@ -134,7 +134,7 @@ class SurfaceTest : public ::testing::Test {
     }
 
     virtual void SetUp() {
-        mComposerClient = new SurfaceComposerClient;
+        mComposerClient = sp<SurfaceComposerClient>::make();
         ASSERT_EQ(NO_ERROR, mComposerClient->initCheck());
 
         // TODO(brianderson): The following sometimes fails and is a source of