commit 4fadb9e566ba493de941e17c4704b5db56f32d23
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 23 22:37:44 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 23 22:37:44 2021 +0000
tree e3f1b504108d31f4e81c989f8bf6a29fc7420bb4
parent 1da42f046525842aa515211a20dc1459cc699a42
parent 280bc1fcc653357a4fbfcc8ea98acdd8acfa3d69

Merge "nativewindow: report errors on error to allocate a handle" am: 04a1d0ddfe am: 2bb81b0c10 am: 280bc1fcc6

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1555466

Change-Id: I63d5d1b1970f54bf7b0b15dd82e2409c318c2211

libs/nativewindow/AHardwareBuffer.cpp

diff --git a/libs/nativewindow/AHardwareBuffer.cpp b/libs/nativewindow/AHardwareBuffer.cpp
index a375d43..79b47a1 100644
--- a/libs/nativewindow/AHardwareBuffer.cpp
+++ b/libs/nativewindow/AHardwareBuffer.cpp
@@ -51,13 +51,13 @@
             std::string("AHardwareBuffer pid [") + std::to_string(getpid()) + "]"));
 
     status_t err = gbuffer->initCheck();
-    if (err != 0 || gbuffer->handle == 0) {
+    if (err != 0 || gbuffer->handle == nullptr) {
         if (err == NO_MEMORY) {
             GraphicBuffer::dumpAllocationsToSystemLog();
         }
         ALOGE("GraphicBuffer(w=%u, h=%u, lc=%u) failed (%s), handle=%p",
                 desc->width, desc->height, desc->layers, strerror(-err), gbuffer->handle);
-        return err;
+        return err == 0 ? UNKNOWN_ERROR : err;
     }
 
     *outBuffer = AHardwareBuffer_from_GraphicBuffer(gbuffer.get());