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

Commit 47734c95 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh
Browse files

resolve merge conflicts of 98a9b2a4 to nyc-dev-plus-aosp 

Change-Id: Iae0a5cb698807d74ba28878d7ce1f69b6ba5219a
parents 20be7bf5 98a9b2a4

camera/ICamera.cpp

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ enum { 
class BpCamera: public BpInterface<ICamera>

{

public:

    BpCamera(const sp<IBinder>& impl)

    explicit BpCamera(const sp<IBinder>& impl)

        : BpInterface<ICamera>(impl)

    {

    }

camera/ICameraClient.cpp

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ enum { 
class BpCameraClient: public BpInterface<ICameraClient>

{

public:

    BpCameraClient(const sp<IBinder>& impl)

    explicit BpCameraClient(const sp<IBinder>& impl)

        : BpInterface<ICameraClient>(impl)

    {

    }

camera/ICameraRecordingProxy.cpp

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ enum { 
class BpCameraRecordingProxy: public BpInterface<ICameraRecordingProxy>

{

public:

    BpCameraRecordingProxy(const sp<IBinder>& impl)

    explicit BpCameraRecordingProxy(const sp<IBinder>& impl)

        : BpInterface<ICameraRecordingProxy>(impl)

    {

    }

camera/ICameraRecordingProxyListener.cpp

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ enum { 
class BpCameraRecordingProxyListener: public BpInterface<ICameraRecordingProxyListener>

{

public:

    BpCameraRecordingProxyListener(const sp<IBinder>& impl)

    explicit BpCameraRecordingProxyListener(const sp<IBinder>& impl)

        : BpInterface<ICameraRecordingProxyListener>(impl)

    {

    }

camera/ICameraServiceProxy.cpp

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ namespace android { 


class BpCameraServiceProxy: public BpInterface<ICameraServiceProxy> {

public:

    BpCameraServiceProxy(const sp<IBinder>& impl) : BpInterface<ICameraServiceProxy>(impl) {}

    explicit BpCameraServiceProxy(const sp<IBinder>& impl)

        : BpInterface<ICameraServiceProxy>(impl) {}



    virtual void pingForUserUpdate() {

        Parcel data;