summaryrefslogtreecommitdiffstats
path: root/media/mtp
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-07-19 14:29:58 -0400
committerMike Lockwood <lockwood@android.com>2010-07-19 14:29:58 -0400
commit73ecd23cc2ebadb8e1fae1cc21ac559524c6b2bb (patch)
tree9b12b725e9c27a9fb079d5f91dbe930563934b68 /media/mtp
parentf913c25c713cbe0fe16dd1cc17bdfaba6b77070f (diff)
downloadframeworks_av-73ecd23cc2ebadb8e1fae1cc21ac559524c6b2bb.zip
frameworks_av-73ecd23cc2ebadb8e1fae1cc21ac559524c6b2bb.tar.gz
frameworks_av-73ecd23cc2ebadb8e1fae1cc21ac559524c6b2bb.tar.bz2
MTP: Only send events to host if we have an open session.
Change-Id: I7b2d0c88c2d2ae0490247703d0fb1b862154db92 Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'media/mtp')
-rw-r--r--media/mtp/MtpServer.cpp28
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() {