ConnectionService: miscellaneous fixes
* Fix a few potential errors due to the use of newer APIs (minSDK is still only 24) * Fix one remaining case of raw usage of generic types.
This commit is contained in:
parent
788818fdda
commit
6ca2ffd6ea
|
@ -5,9 +5,12 @@ import java.util.Collections;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.Stack;
|
import java.util.Stack;
|
||||||
|
import java.util.Vector;
|
||||||
|
|
||||||
|
import com.google.common.base.Joiner;
|
||||||
import com.google.common.collect.ImmutableSet;
|
import com.google.common.collect.ImmutableSet;
|
||||||
|
|
||||||
|
import android.os.Build;
|
||||||
import android.telecom.CallAudioState;
|
import android.telecom.CallAudioState;
|
||||||
import android.telecom.Connection;
|
import android.telecom.Connection;
|
||||||
import android.telecom.ConnectionRequest;
|
import android.telecom.ConnectionRequest;
|
||||||
|
@ -246,6 +249,8 @@ public class ConnectionService extends android.telecom.ConnectionService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onAudioDeviceChanged(AppRTCAudioManager.AudioDevice selectedAudioDevice, Set<AppRTCAudioManager.AudioDevice> availableAudioDevices) {
|
public void onAudioDeviceChanged(AppRTCAudioManager.AudioDevice selectedAudioDevice, Set<AppRTCAudioManager.AudioDevice> availableAudioDevices) {
|
||||||
|
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O) return;
|
||||||
|
|
||||||
switch(selectedAudioDevice) {
|
switch(selectedAudioDevice) {
|
||||||
case SPEAKER_PHONE:
|
case SPEAKER_PHONE:
|
||||||
setAudioRoute(CallAudioState.ROUTE_SPEAKER);
|
setAudioRoute(CallAudioState.ROUTE_SPEAKER);
|
||||||
|
@ -310,9 +315,9 @@ public class ConnectionService extends android.telecom.ConnectionService {
|
||||||
while (!postDial.empty()) {
|
while (!postDial.empty()) {
|
||||||
String next = postDial.pop();
|
String next = postDial.pop();
|
||||||
if (next.equals(";")) {
|
if (next.equals(";")) {
|
||||||
Stack v = (Stack) postDial.clone();
|
Vector<String> v = new Vector<>(postDial);
|
||||||
Collections.reverse(v);
|
Collections.reverse(v);
|
||||||
setPostDialWait(String.join("", v));
|
setPostDialWait(Joiner.on("").join(v));
|
||||||
return;
|
return;
|
||||||
} else if (next.equals(",")) {
|
} else if (next.equals(",")) {
|
||||||
sleep(2000);
|
sleep(2000);
|
||||||
|
|
Loading…
Reference in a new issue