Преглед изворни кода

android: fix selecting the Bluetooth route

Samsung devices (of course) seem to stick with the earpiece if we first select
Bluetooth but then set speaker to false. Reverse the order to make everyone
happy.

This only applies to the generic and legacy handlers.
master
Saúl Ibarra Corretgé пре 6 година
родитељ
комит
4d243f9b92

+ 3
- 3
android/sdk/src/main/java/org/jitsi/meet/sdk/AudioDeviceHandlerGeneric.java Прегледај датотеку

@@ -198,11 +198,11 @@ class AudioDeviceHandlerGeneric implements
198 198
 
199 199
     @Override
200 200
     public void setAudioRoute(String device) {
201
-        // Turn bluetooth on / off
202
-        setBluetoothAudioRoute(device.equals(AudioModeModule.DEVICE_BLUETOOTH));
203
-
204 201
         // Turn speaker on / off
205 202
         audioManager.setSpeakerphoneOn(device.equals(AudioModeModule.DEVICE_SPEAKER));
203
+
204
+        // Turn bluetooth on / off
205
+        setBluetoothAudioRoute(device.equals(AudioModeModule.DEVICE_BLUETOOTH));
206 206
     }
207 207
 
208 208
     @Override

+ 3
- 3
android/sdk/src/main/java/org/jitsi/meet/sdk/AudioDeviceHandlerLegacy.java Прегледај датотеку

@@ -196,11 +196,11 @@ class AudioDeviceHandlerLegacy implements
196 196
 
197 197
     @Override
198 198
     public void setAudioRoute(String device) {
199
-        // Turn bluetooth on / off
200
-        setBluetoothAudioRoute(device.equals(AudioModeModule.DEVICE_BLUETOOTH));
201
-
202 199
         // Turn speaker on / off
203 200
         audioManager.setSpeakerphoneOn(device.equals(AudioModeModule.DEVICE_SPEAKER));
201
+
202
+        // Turn bluetooth on / off
203
+        setBluetoothAudioRoute(device.equals(AudioModeModule.DEVICE_BLUETOOTH));
204 204
     }
205 205
 
206 206
     @Override

Loading…
Откажи
Сачувај