Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f758231 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge changes I7f696e42,I51c6df3c into jb-mr2-dev 

* changes:
  Make GraphicBuffer a RefBase
  Fix RefBase debugging. O_CREAT must specify the mode.
parents 2be4e8ff e041716b

include/ui/GraphicBuffer.h

+3 −4
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <ui/PixelFormat.h>

#include <ui/Rect.h>

#include <utils/Flattenable.h>

#include <utils/RefBase.h>





struct ANativeWindowBuffer;
@@ -37,10 +38,8 @@ class GraphicBufferMapper; 
// ===========================================================================



class GraphicBuffer

    : public ANativeObjectBase<

        ANativeWindowBuffer,

        GraphicBuffer, 

        LightRefBase<GraphicBuffer> >, public Flattenable

    : public ANativeObjectBase< ANativeWindowBuffer, GraphicBuffer, RefBase >,

      public Flattenable

{

public:

libs/utils/RefBase.cpp

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ public: 
        {

            char name[100];

            snprintf(name, 100, "/data/%p.stack", this);

            int rc = open(name, O_RDWR | O_CREAT | O_APPEND);

            int rc = open(name, O_RDWR | O_CREAT | O_APPEND, 644);

            if (rc >= 0) {

                write(rc, text.string(), text.length());

                close(rc);