diff options
| author | Jerry Zhang <zhangjerry@google.com> | 2018-03-27 15:29:09 -0700 |
|---|---|---|
| committer | Jerry Zhang <zhangjerry@google.com> | 2018-03-27 17:18:35 -0700 |
| commit | d9f3005fc3d3e6544e5e94052d9229413b0181d1 (patch) | |
| tree | d3b7d63283f2c0aa8b103714a639d933dadd3013 /media/jni/android_mtp_MtpServer.cpp | |
| parent | 56e9c026b33da783088c10a3d1162076a8e25cb6 (diff) | |
Fix Unicode handling.
Change type usages based on changes
in libmtp.
Bug: 70546563
Test: Mtp works, tests pass
Change-Id: Id38c30e3a1311328ec2293792ae0866da2cf90be
Diffstat (limited to 'media/jni/android_mtp_MtpServer.cpp')
| -rw-r--r-- | media/jni/android_mtp_MtpServer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/jni/android_mtp_MtpServer.cpp b/media/jni/android_mtp_MtpServer.cpp index 8730e0622200..c60590a748e0 100644 --- a/media/jni/android_mtp_MtpServer.cpp +++ b/media/jni/android_mtp_MtpServer.cpp @@ -67,10 +67,10 @@ android_mtp_MtpServer_setup(JNIEnv *env, jobject thiz, jobject javaDatabase, job int controlFd = dup(jniGetFDFromFileDescriptor(env, jControlFd)); MtpServer* server = new MtpServer(getMtpDatabase(env, javaDatabase), controlFd, usePtp, - MtpString((deviceInfoManufacturerStr != NULL) ? deviceInfoManufacturerStr : ""), - MtpString((deviceInfoModelStr != NULL) ? deviceInfoModelStr : ""), - MtpString((deviceInfoDeviceVersionStr != NULL) ? deviceInfoDeviceVersionStr : ""), - MtpString((deviceInfoSerialNumberStr != NULL) ? deviceInfoSerialNumberStr : "")); + (deviceInfoManufacturerStr != NULL) ? deviceInfoManufacturerStr : "", + (deviceInfoModelStr != NULL) ? deviceInfoModelStr : "", + (deviceInfoDeviceVersionStr != NULL) ? deviceInfoDeviceVersionStr : "", + (deviceInfoSerialNumberStr != NULL) ? deviceInfoSerialNumberStr : ""); if (deviceInfoManufacturerStr != NULL) { env->ReleaseStringUTFChars(deviceInfoManufacturer, deviceInfoManufacturerStr); } |