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

Commit f888020c authored by Marco Nelissen's avatar Marco Nelissen
Browse files

Update calls to IInterface::asBinder() 

to use the new static version.

Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a

Conflicts:
	media/libmedia/IAudioFlinger.cpp
	media/libmedia/IMediaPlayer.cpp
	media/libstagefright/CameraSource.cpp
parent d0264109

camera/Camera.cpp

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ sp<Camera> Camera::create(const sp<ICamera>& camera) 
    if (camera->connect(c) == NO_ERROR) {

        c->mStatus = NO_ERROR;

        c->mCamera = camera;

        camera->asBinder()->linkToDeath(c);

        IInterface::asBinder(camera)->linkToDeath(c);

        return c;

    }

    return 0;
@@ -93,7 +93,7 @@ status_t Camera::connectLegacy(int cameraId, int halVersion, 
                                        clientUid, /*out*/c->mCamera);

    }

    if (status == OK && c->mCamera != 0) {

        c->mCamera->asBinder()->linkToDeath(c);

        IInterface::asBinder(c->mCamera)->linkToDeath(c);

        c->mStatus = NO_ERROR;

        camera = c;

    } else {

camera/CameraBase.cpp

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ sp<TCam> CameraBase<TCam, TCamTraits>::connect(int cameraId, 
                                             /*out*/ c->mCamera);

    }

    if (status == OK && c->mCamera != 0) {

        c->mCamera->asBinder()->linkToDeath(c);

        IInterface::asBinder(c->mCamera)->linkToDeath(c);

        c->mStatus = NO_ERROR;

    } else {

        ALOGW("An error occurred while connecting to camera: %d", cameraId);
@@ -122,7 +122,7 @@ void CameraBase<TCam, TCamTraits>::disconnect() 
    ALOGV("%s: disconnect", __FUNCTION__);

    if (mCamera != 0) {

        mCamera->disconnect();

        mCamera->asBinder()->unlinkToDeath(this);

        IInterface::asBinder(mCamera)->unlinkToDeath(this);

        mCamera = 0;

    }

    ALOGV("%s: disconnect (done)", __FUNCTION__);

camera/ICamera.cpp

+4 −4
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public: 
        ALOGV("setPreviewTarget");

        Parcel data, reply;

        data.writeInterfaceToken(ICamera::getInterfaceDescriptor());

        sp<IBinder> b(bufferProducer != NULL ? bufferProducer->asBinder() : NULL);

        sp<IBinder> b(IInterface::asBinder(bufferProducer));

        data.writeStrongBinder(b);

        remote()->transact(SET_PREVIEW_TARGET, data, &reply);

        return reply.readInt32();
@@ -98,7 +98,7 @@ public: 
        ALOGV("setPreviewCallbackTarget");

        Parcel data, reply;

        data.writeInterfaceToken(ICamera::getInterfaceDescriptor());

        sp<IBinder> b(callbackProducer->asBinder());

        sp<IBinder> b(IInterface::asBinder(callbackProducer));

        data.writeStrongBinder(b);

        remote()->transact(SET_PREVIEW_CALLBACK_TARGET, data, &reply);

        return reply.readInt32();
@@ -147,7 +147,7 @@ public: 
        ALOGV("releaseRecordingFrame");

        Parcel data, reply;

        data.writeInterfaceToken(ICamera::getInterfaceDescriptor());

        data.writeStrongBinder(mem->asBinder());

        data.writeStrongBinder(IInterface::asBinder(mem));

        remote()->transact(RELEASE_RECORDING_FRAME, data, &reply);

    }
@@ -250,7 +250,7 @@ public: 
    {

        Parcel data, reply;

        data.writeInterfaceToken(ICamera::getInterfaceDescriptor());

        data.writeStrongBinder(cameraClient->asBinder());

        data.writeStrongBinder(IInterface::asBinder(cameraClient));

        remote()->transact(CONNECT, data, &reply);

        return reply.readInt32();

    }

camera/ICameraClient.cpp

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public: 
        Parcel data, reply;

        data.writeInterfaceToken(ICameraClient::getInterfaceDescriptor());

        data.writeInt32(msgType);

        data.writeStrongBinder(imageData->asBinder());

        data.writeStrongBinder(IInterface::asBinder(imageData));

        if (metadata) {

            data.writeInt32(metadata->number_of_faces);

            data.write(metadata->faces, sizeof(camera_face_t) * metadata->number_of_faces);
@@ -74,7 +74,7 @@ public: 
        data.writeInterfaceToken(ICameraClient::getInterfaceDescriptor());

        data.writeInt64(timestamp);

        data.writeInt32(msgType);

        data.writeStrongBinder(imageData->asBinder());

        data.writeStrongBinder(IInterface::asBinder(imageData));

        remote()->transact(DATA_CALLBACK_TIMESTAMP, data, &reply, IBinder::FLAG_ONEWAY);

    }

};

camera/ICameraRecordingProxy.cpp

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ public: 
        ALOGV("startRecording");

        Parcel data, reply;

        data.writeInterfaceToken(ICameraRecordingProxy::getInterfaceDescriptor());

        data.writeStrongBinder(listener->asBinder());

        data.writeStrongBinder(IInterface::asBinder(listener));

        remote()->transact(START_RECORDING, data, &reply);

        return reply.readInt32();

    }
@@ -63,7 +63,7 @@ public: 
        ALOGV("releaseRecordingFrame");

        Parcel data, reply;

        data.writeInterfaceToken(ICameraRecordingProxy::getInterfaceDescriptor());

        data.writeStrongBinder(mem->asBinder());

        data.writeStrongBinder(IInterface::asBinder(mem));

        remote()->transact(RELEASE_RECORDING_FRAME, data, &reply);

    }

};