Catch unsatisfied link error on start if webrtc so isn't found

// FREEBIE
pull/1/head
Moxie Marlinspike 8 years ago
parent 5be246ec8f
commit e452862813

@ -159,27 +159,31 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
} }
private void initializeWebRtc() { private void initializeWebRtc() {
Set<String> HARDWARE_AEC_BLACKLIST = new HashSet<String>() {{ try {
add("Pixel"); Set<String> HARDWARE_AEC_BLACKLIST = new HashSet<String>() {{
add("Pixel XL"); add("Pixel");
add("Moto G5"); add("Pixel XL");
}}; add("Moto G5");
}};
Set<String> OPEN_SL_ES_WHITELIST = new HashSet<String>() {{
add("Pixel"); Set<String> OPEN_SL_ES_WHITELIST = new HashSet<String>() {{
add("Pixel XL"); add("Pixel");
}}; add("Pixel XL");
}};
if (Build.VERSION.SDK_INT >= 11) {
if (HARDWARE_AEC_BLACKLIST.contains(Build.MODEL)) { if (Build.VERSION.SDK_INT >= 11) {
WebRtcAudioUtils.setWebRtcBasedAcousticEchoCanceler(true); if (HARDWARE_AEC_BLACKLIST.contains(Build.MODEL)) {
} WebRtcAudioUtils.setWebRtcBasedAcousticEchoCanceler(true);
}
if (!OPEN_SL_ES_WHITELIST.contains(Build.MODEL)) { if (!OPEN_SL_ES_WHITELIST.contains(Build.MODEL)) {
WebRtcAudioManager.setBlacklistDeviceForOpenSLESUsage(true); WebRtcAudioManager.setBlacklistDeviceForOpenSLESUsage(true);
} }
PeerConnectionFactory.initializeAndroidGlobals(this, true, true, true); PeerConnectionFactory.initializeAndroidGlobals(this, true, true, true);
}
} catch (UnsatisfiedLinkError e) {
Log.w(TAG, e);
} }
} }

Loading…
Cancel
Save