Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1341285: Fix bustage on android due to merge failure r=bustage

Browse Source
This commit is contained in:
Randell Jesup 2017-06-13 02:33:20 -04:00
parent 0b42833bd8
commit 6b92cb978e
1 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
media/webrtc/trunk/webrtc/modules/audio_device/android/audio_record_jni.cc
View File

@ -285,32 +285,4 @@ int32_t AudioRecordJni::RecordingDeviceName(uint16_t index,
return 0;
}
int32_t AudioRecordJni::RecordingDeviceName(uint16_t index,
char name[kAdmMaxDeviceNameSize],
char guid[kAdmMaxGuidSize]) {
// Return empty string
memset(name, 0, kAdmMaxDeviceNameSize);
if (guid)
{
memset(guid, 0, kAdmMaxGuidSize);
}
return 0;
}
int32_t AudioRecordJni::RecordingDeviceName(uint16_t index,
char name[kAdmMaxDeviceNameSize],
char guid[kAdmMaxGuidSize]) {
// Return empty string
memset(name, 0, kAdmMaxDeviceNameSize);
if (guid)
{
memset(guid, 0, kAdmMaxGuidSize);
}
return 0;
}
} // namespace webrtc