diff options
| author | Jerry Zhang <zhangjerry@google.com> | 2017-10-17 13:47:51 -0700 |
|---|---|---|
| committer | Jerry Zhang <zhangjerry@google.com> | 2017-10-17 15:27:03 -0700 |
| commit | def7b1930013e31e85bed904ff38cc3af71e75b2 (patch) | |
| tree | 8c7ae8b3476202ab7a194c6e203be1da7ba108eb /media/jni/android_mtp_MtpServer.cpp | |
| parent | 16fbd3a1d821a375abbc23749b891489aecd53d7 (diff) | |
Add storageId to moveObjects
When moving between different storages, the storageId
must be changed as well.
Bug: 67028892
Test: Move between storages with virtual sdcard.
Change-Id: Ie82aa8d53686bfffb7c26b46a49524a00f2f0214
Diffstat (limited to 'media/jni/android_mtp_MtpServer.cpp')
| -rw-r--r-- | media/jni/android_mtp_MtpServer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_mtp_MtpServer.cpp b/media/jni/android_mtp_MtpServer.cpp index e9e93099c1e2..6ce104d01a9e 100644 --- a/media/jni/android_mtp_MtpServer.cpp +++ b/media/jni/android_mtp_MtpServer.cpp @@ -72,7 +72,7 @@ android_mtp_MtpServer_setup(JNIEnv *env, jobject thiz, jobject javaDatabase, jbo const char *deviceInfoDeviceVersionStr = env->GetStringUTFChars(deviceInfoDeviceVersion, NULL); const char *deviceInfoSerialNumberStr = env->GetStringUTFChars(deviceInfoSerialNumber, NULL); MtpServer* server = new MtpServer(getMtpDatabase(env, javaDatabase), - usePtp, AID_MEDIA_RW, 0664, 0775, + usePtp, MtpString((deviceInfoManufacturerStr != NULL) ? deviceInfoManufacturerStr : ""), MtpString((deviceInfoModelStr != NULL) ? deviceInfoModelStr : ""), MtpString((deviceInfoDeviceVersionStr != NULL) ? deviceInfoDeviceVersionStr : ""), |