diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-07-19 11:31:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-19 11:31:54 -0700 |
| commit | 6113efbd1e5f7495b80bf64f7ee90a571e3cf6a6 (patch) | |
| tree | 1daeee28a6230f530263d1c9698c40c6fb86f87f /media | |
| parent | 618678e74cc7a013b84d8f5b53d19dd2c5463a85 (diff) | |
| parent | 73ecd23cc2ebadb8e1fae1cc21ac559524c6b2bb (diff) | |
| download | frameworks_av-6113efbd1e5f7495b80bf64f7ee90a571e3cf6a6.zip frameworks_av-6113efbd1e5f7495b80bf64f7ee90a571e3cf6a6.tar.gz frameworks_av-6113efbd1e5f7495b80bf64f7ee90a571e3cf6a6.tar.bz2 | |
Merge "MTP: Only send events to host if we have an open session."
Diffstat (limited to 'media')
| -rw-r--r-- | media/mtp/MtpServer.cpp | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/media/mtp/MtpServer.cpp b/media/mtp/MtpServer.cpp index 163c05b..adfe3a9 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() { |