diff options
| author | Marco Nelissen <marcone@google.com> | 2015-01-23 19:54:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-23 19:54:44 +0000 |
| commit | 64c496c8d51c71605cd34a510da2ecd8180656ec (patch) | |
| tree | 7fb64dfadc976e6f489f6fba2280643f6a0bae47 | |
| parent | ddc1216dcf8f9dc1a1340ed4bc6c6f28f29b1076 (diff) | |
| parent | ea9f215a13f1a5e6455be91624a81a024641a26d (diff) | |
| download | frameworks_av-64c496c8d51c71605cd34a510da2ecd8180656ec.zip frameworks_av-64c496c8d51c71605cd34a510da2ecd8180656ec.tar.gz frameworks_av-64c496c8d51c71605cd34a510da2ecd8180656ec.tar.bz2 | |
Merge "Fix MTP delete" into lmp-mr1-dev
| -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 |