Snap for 13097162 from ee4497116b560289f1ad95bae733f707a25a129a to 25Q2-release

Change-Id: Iff8ef6cb85edfbfe64bbff67fd27e5c7241d5444

1 files changed, 11 insertions, 11 deletions

diff --git a/libs/gui/IGraphicBufferProducer.cpp b/libs/gui/IGraphicBufferProducer.cpp
index 1d1910eb08..9f71eb16e7 100644
--- a/libs/gui/IGraphicBufferProducer.cpp
+++ b/libs/gui/IGraphicBufferProducer.cpp
@@ -104,7 +104,7 @@ public:
         }
         bool nonNull = reply.readInt32();
         if (nonNull) {
-            *buf = sp<GraphicBuffer>::make();
+            *buf = new GraphicBuffer();
             result = reply.read(**buf);
             if(result != NO_ERROR) {
                 (*buf).clear();
@@ -197,7 +197,7 @@ public:
         }
 
         *buf = reply.readInt32();
-        *fence = sp<Fence>::make();
+        *fence = new Fence();
         result = reply.read(**fence);
         if (result != NO_ERROR) {
             fence->clear();
@@ -293,7 +293,7 @@ public:
         if (result == NO_ERROR) {
             bool nonNull = reply.readInt32();
             if (nonNull) {
-                *outBuffer = sp<GraphicBuffer>::make();
+                *outBuffer = new GraphicBuffer;
                 result = reply.read(**outBuffer);
                 if (result != NO_ERROR) {
                     outBuffer->clear();
@@ -302,7 +302,7 @@ public:
             }
             nonNull = reply.readInt32();
             if (nonNull) {
-                *outFence = sp<Fence>::make();
+                *outFence = new Fence;
                 result = reply.read(**outFence);
                 if (result != NO_ERROR) {
                     outBuffer->clear();
@@ -640,7 +640,7 @@ public:
         bool hasBuffer = reply.readBool();
         sp<GraphicBuffer> buffer;
         if (hasBuffer) {
-            buffer = sp<GraphicBuffer>::make();
+            buffer = new GraphicBuffer();
             result = reply.read(*buffer);
             if (result == NO_ERROR) {
                 result = reply.read(outTransformMatrix, sizeof(float) * 16);
@@ -650,7 +650,7 @@ public:
             ALOGE("getLastQueuedBuffer failed to read buffer: %d", result);
             return result;
         }
-        sp<Fence> fence = sp<Fence>::make();
+        sp<Fence> fence(new Fence);
         result = reply.read(*fence);
         if (result != NO_ERROR) {
             ALOGE("getLastQueuedBuffer failed to read fence: %d", result);
@@ -687,7 +687,7 @@ public:
         }
         sp<GraphicBuffer> buffer;
         if (hasBuffer) {
-            buffer = sp<GraphicBuffer>::make();
+            buffer = new GraphicBuffer();
             result = reply.read(*buffer);
             if (result == NO_ERROR) {
                 result = reply.read(*outRect);
@@ -700,7 +700,7 @@ public:
             ALOGE("getLastQueuedBuffer failed to read buffer: %d", result);
             return result;
         }
-        sp<Fence> fence = sp<Fence>::make();
+        sp<Fence> fence(new Fence);
         result = reply.read(*fence);
         if (result != NO_ERROR) {
             ALOGE("getLastQueuedBuffer failed to read fence: %d", result);
@@ -1232,7 +1232,7 @@ status_t BnGraphicBufferProducer::onTransact(
         }
         case ATTACH_BUFFER: {
             CHECK_INTERFACE(IGraphicBufferProducer, data, reply);
-            sp<GraphicBuffer> buffer = sp<GraphicBuffer>::make();
+            sp<GraphicBuffer> buffer = new GraphicBuffer();
             status_t result = data.read(*buffer.get());
             int slot = 0;
             if (result == NO_ERROR) {
@@ -1250,7 +1250,7 @@ status_t BnGraphicBufferProducer::onTransact(
                 return result;
             }
             for (sp<GraphicBuffer>& buffer : buffers) {
-                buffer = sp<GraphicBuffer>::make();
+                buffer = new GraphicBuffer();
                 result = data.read(*buffer.get());
                 if (result != NO_ERROR) {
                     return result;
@@ -1306,7 +1306,7 @@ status_t BnGraphicBufferProducer::onTransact(
         case CANCEL_BUFFER: {
             CHECK_INTERFACE(IGraphicBufferProducer, data, reply);
             int buf = data.readInt32();
-            sp<Fence> fence = sp<Fence>::make();
+            sp<Fence> fence = new Fence();
             status_t result = data.read(*fence.get());
             if (result == NO_ERROR) {
                 result = cancelBuffer(buf, fence);