mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-05-08 09:18:39 +01:00
Move device specific control to RingRTC
This commit is contained in:
committed by
Greyson Parrelli
parent
2fcb240c2b
commit
41585699d2
@@ -82,8 +82,6 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
|||||||
import org.thoughtcrime.securesms.util.Util;
|
import org.thoughtcrime.securesms.util.Util;
|
||||||
import org.thoughtcrime.securesms.util.VersionTracker;
|
import org.thoughtcrime.securesms.util.VersionTracker;
|
||||||
import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
|
import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
|
||||||
import org.webrtc.voiceengine.WebRtcAudioManager;
|
|
||||||
import org.webrtc.voiceengine.WebRtcAudioUtils;
|
|
||||||
import org.whispersystems.libsignal.logging.SignalProtocolLoggerProvider;
|
import org.whispersystems.libsignal.logging.SignalProtocolLoggerProvider;
|
||||||
|
|
||||||
import java.security.Security;
|
import java.security.Security;
|
||||||
@@ -343,14 +341,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
|
|||||||
|
|
||||||
private void initializeRingRtc() {
|
private void initializeRingRtc() {
|
||||||
try {
|
try {
|
||||||
if (RtcDeviceLists.hardwareAECBlocked()) {
|
|
||||||
WebRtcAudioUtils.setWebRtcBasedAcousticEchoCanceler(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!RtcDeviceLists.openSLESAllowed()) {
|
|
||||||
WebRtcAudioManager.setBlacklistDeviceForOpenSLESUsage(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
CallManager.initialize(this, new RingRtcLogger());
|
CallManager.initialize(this, new RingRtcLogger());
|
||||||
} catch (UnsatisfiedLinkError e) {
|
} catch (UnsatisfiedLinkError e) {
|
||||||
throw new AssertionError("Unable to load ringrtc library", e);
|
throw new AssertionError("Unable to load ringrtc library", e);
|
||||||
|
|||||||
@@ -1,48 +0,0 @@
|
|||||||
package org.thoughtcrime.securesms;
|
|
||||||
|
|
||||||
import android.os.Build;
|
|
||||||
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Device hardware capability lists.
|
|
||||||
* <p>
|
|
||||||
* Moved outside of ApplicationContext as the indirection was important for API19 support with desugaring: https://issuetracker.google.com/issues/183419297
|
|
||||||
*/
|
|
||||||
final class RtcDeviceLists {
|
|
||||||
|
|
||||||
private RtcDeviceLists() {}
|
|
||||||
|
|
||||||
static Set<String> hardwareAECBlockList() {
|
|
||||||
return new HashSet<String>() {{
|
|
||||||
add("Pixel");
|
|
||||||
add("Pixel XL");
|
|
||||||
add("Moto G5");
|
|
||||||
add("Moto G (5S) Plus");
|
|
||||||
add("Moto G4");
|
|
||||||
add("TA-1053");
|
|
||||||
add("Mi A1");
|
|
||||||
add("Mi A2");
|
|
||||||
add("E5823"); // Sony z5 compact
|
|
||||||
add("Redmi Note 5");
|
|
||||||
add("FP2"); // Fairphone FP2
|
|
||||||
add("MI 5");
|
|
||||||
}};
|
|
||||||
}
|
|
||||||
|
|
||||||
static Set<String> openSlEsAllowList() {
|
|
||||||
return new HashSet<String>() {{
|
|
||||||
add("Pixel");
|
|
||||||
add("Pixel XL");
|
|
||||||
}};
|
|
||||||
}
|
|
||||||
|
|
||||||
static boolean hardwareAECBlocked() {
|
|
||||||
return hardwareAECBlockList().contains(Build.MODEL);
|
|
||||||
}
|
|
||||||
|
|
||||||
static boolean openSLESAllowed() {
|
|
||||||
return openSlEsAllowList().contains(Build.MODEL);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user