diff options
| author | Marco Nelissen <marcone@google.com> | 2015-01-23 20:57:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-23 20:57:30 +0000 |
| commit | d35c21207762c33c6f8f517e52533d6738d9adf0 (patch) | |
| tree | 275774760d1438dd667a2423ec3ed82cc74d8dd6 /media/mtp | |
| parent | 882ffba6a98dbe97a07f094ce87d9b81b756971e (diff) | |
| parent | 1f7101ee7096dc11cd212935d84c0f9a3376b061 (diff) | |
| download | frameworks_av-d35c21207762c33c6f8f517e52533d6738d9adf0.zip frameworks_av-d35c21207762c33c6f8f517e52533d6738d9adf0.tar.gz frameworks_av-d35c21207762c33c6f8f517e52533d6738d9adf0.tar.bz2 | |
am 1f7101ee: am 64c496c8: Merge "Fix MTP delete" into lmp-mr1-dev
* commit '1f7101ee7096dc11cd212935d84c0f9a3376b061':
Fix MTP delete
Diffstat (limited to 'media/mtp')
| -rw-r--r-- | media/mtp/MtpServer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/mtp/MtpServer.cpp b/media/mtp/MtpServer.cpp index e4e16f2..07199e3 100644 --- a/media/mtp/MtpServer.cpp +++ b/media/mtp/MtpServer.cpp @@ -1119,10 +1119,10 @@ static void deletePath(const char* path) { MtpResponseCode MtpServer::doDeleteObject() { if (!hasStorage()) return MTP_RESPONSE_INVALID_OBJECT_HANDLE; - if (mRequest.getParameterCount() < 2) + if (mRequest.getParameterCount() < 1) return MTP_RESPONSE_INVALID_PARAMETER; MtpObjectHandle handle = mRequest.getParameter(1); - MtpObjectFormat format = mRequest.getParameter(2); + MtpObjectFormat format; // FIXME - support deleting all objects if handle is 0xFFFFFFFF // FIXME - implement deleting objects by format |