diff options
author | Marco Nelissen <marcone@google.com> | 2015-01-23 19:58:36 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-23 19:58:36 +0000 |
commit | 1f7101ee7096dc11cd212935d84c0f9a3376b061 (patch) | |
tree | 7fb64dfadc976e6f489f6fba2280643f6a0bae47 /media/mtp | |
parent | d8aff827c3c7d1396b624b1462c81e415ef3c160 (diff) | |
parent | 64c496c8d51c71605cd34a510da2ecd8180656ec (diff) | |
download | frameworks_av-1f7101ee7096dc11cd212935d84c0f9a3376b061.zip frameworks_av-1f7101ee7096dc11cd212935d84c0f9a3376b061.tar.gz frameworks_av-1f7101ee7096dc11cd212935d84c0f9a3376b061.tar.bz2 |
am 64c496c8: Merge "Fix MTP delete" into lmp-mr1-dev
* commit '64c496c8d51c71605cd34a510da2ecd8180656ec':
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 |