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

Commit 68a593e7 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh
Browse files

resolve merge conflicts of 168dc86c to nyc-dev-plus-aosp 

Change-Id: I1554cec6ea880a87921f723bc96972cb8e1d3c5c
parents 53925d20 168dc86c

libs/binder/BufferedTextOutput.cpp

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ namespace android { 


struct BufferedTextOutput::BufferState : public RefBase

{

    BufferState(int32_t _seq)

    explicit BufferState(int32_t _seq)

        : seq(_seq)

        , buffer(NULL)

        , bufferPos(0)

libs/binder/IAppOpsCallback.cpp

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ namespace android { 
class BpAppOpsCallback : public BpInterface<IAppOpsCallback>

{

public:

    BpAppOpsCallback(const sp<IBinder>& impl)

    explicit BpAppOpsCallback(const sp<IBinder>& impl)

        : BpInterface<IAppOpsCallback>(impl)

    {

    }

libs/binder/IAppOpsService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ namespace android { 
class BpAppOpsService : public BpInterface<IAppOpsService>

{

public:

    BpAppOpsService(const sp<IBinder>& impl)

    explicit BpAppOpsService(const sp<IBinder>& impl)

        : BpInterface<IAppOpsService>(impl)

    {

    }

libs/binder/IBatteryStats.cpp

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ namespace android { 
class BpBatteryStats : public BpInterface<IBatteryStats>

{

public:

    BpBatteryStats(const sp<IBinder>& impl)

    explicit BpBatteryStats(const sp<IBinder>& impl)

        : BpInterface<IBatteryStats>(impl)

    {

    }

libs/binder/IMemory.cpp

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ enum { 
class BpMemoryHeap : public BpInterface<IMemoryHeap>

{

public:

    BpMemoryHeap(const sp<IBinder>& impl);

    explicit BpMemoryHeap(const sp<IBinder>& impl);

    virtual ~BpMemoryHeap();



    virtual int getHeapID() const;
@@ -123,7 +123,7 @@ enum { 
class BpMemory : public BpInterface<IMemory>

{

public:

    BpMemory(const sp<IBinder>& impl);

    explicit BpMemory(const sp<IBinder>& impl);

    virtual ~BpMemory();

    virtual sp<IMemoryHeap> getMemory(ssize_t* offset=0, size_t* size=0) const;