From dc453d4ee70cac0d04ce495fb2de6d5b52c6399b Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Mon, 19 Jul 2010 14:29:58 -0400 Subject: [PATCH] MTP: Only send events to host if we have an open session. Change-Id: I7b2d0c88c2d2ae0490247703d0fb1b862154db92 Signed-off-by: Mike Lockwood --- media/mtp/MtpServer.cpp | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/media/mtp/MtpServer.cpp b/media/mtp/MtpServer.cpp index 163c05be3dc0c..adfe3a904b416 100644 --- a/media/mtp/MtpServer.cpp +++ b/media/mtp/MtpServer.cpp @@ -245,21 +245,25 @@ MtpProperty* MtpServer::getDeviceProperty(MtpPropertyCode propCode) { } void MtpServer::sendObjectAdded(MtpObjectHandle handle) { - LOGD("sendObjectAdded %d\n", handle); - mEvent.setEventCode(MTP_EVENT_OBJECT_ADDED); - mEvent.setTransactionID(mRequest.getTransactionID()); - mEvent.setParameter(1, handle); - int ret = mEvent.write(mFD); - LOGD("mEvent.write returned %d\n", ret); + if (mSessionOpen) { + LOGD("sendObjectAdded %d\n", handle); + mEvent.setEventCode(MTP_EVENT_OBJECT_ADDED); + mEvent.setTransactionID(mRequest.getTransactionID()); + mEvent.setParameter(1, handle); + int ret = mEvent.write(mFD); + LOGD("mEvent.write returned %d\n", ret); + } } void MtpServer::sendObjectRemoved(MtpObjectHandle handle) { - LOGD("sendObjectRemoved %d\n", handle); - mEvent.setEventCode(MTP_EVENT_OBJECT_REMOVED); - mEvent.setTransactionID(mRequest.getTransactionID()); - mEvent.setParameter(1, handle); - int ret = mEvent.write(mFD); - LOGD("mEvent.write returned %d\n", ret); + if (mSessionOpen) { + LOGD("sendObjectRemoved %d\n", handle); + mEvent.setEventCode(MTP_EVENT_OBJECT_REMOVED); + mEvent.setTransactionID(mRequest.getTransactionID()); + mEvent.setParameter(1, handle); + int ret = mEvent.write(mFD); + LOGD("mEvent.write returned %d\n", ret); + } } void MtpServer::initObjectProperties() {