From 2ca4318cc1ee57dda907ba2069bd61d162b1baef Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Thu, 31 Aug 2017 06:57:16 -0700 Subject: Update Dialer source to latest internal Google revision. Previously, Android's Dialer app was developed in an internal Google source control system and only exported to public during AOSP drops. The Dialer team is now switching to a public development model similar to the telephony team. This CL represents all internal Google changes that were committed to Dialer between the public O release and today's tip of tree on internal master. This CL squashes those changes into a single commit. In subsequent changes, changes will be exported on a per-commit basis. Test: make, flash install, run Merged-In: I45270eaa8ce732d71a1bd84b08c7fa0e99af3160 Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8 PiperOrigin-RevId: 167068436 --- .../incallui/audiomode/AudioModeProvider.java | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'java/com/android/incallui/audiomode/AudioModeProvider.java') diff --git a/java/com/android/incallui/audiomode/AudioModeProvider.java b/java/com/android/incallui/audiomode/AudioModeProvider.java index f62afa7f2..eb59e95d4 100644 --- a/java/com/android/incallui/audiomode/AudioModeProvider.java +++ b/java/com/android/incallui/audiomode/AudioModeProvider.java @@ -16,7 +16,11 @@ package com.android.incallui.audiomode; +import android.content.Context; +import android.media.AudioDeviceInfo; +import android.media.AudioManager; import android.telecom.CallAudioState; +import com.android.dialer.common.LogUtil; import java.util.ArrayList; import java.util.List; @@ -61,6 +65,47 @@ public class AudioModeProvider { return audioState; } + /** + * Sets a approximated audio state before {@link #onAudioStateChanged} is called. Classes such as + * {@link com.android.incallui.ProximitySensor} fetches the audio state before it is updated by + * telecom. This method attempts to guess the correct routing based on connected audio devices. + * The audio state may still be wrong on a second call due to b/64811128, telecom setting the + * route back to earpiece when a call ends. + */ + public void initializeAudioState(Context context) { + onAudioStateChanged( + new CallAudioState(false, getApproximatedAudioRoute(context), SUPPORTED_AUDIO_ROUTE_ALL)); + } + + private static int getApproximatedAudioRoute(Context context) { + AudioManager audioManager = context.getSystemService(AudioManager.class); + boolean hasBluetooth = false; + boolean hasHeadset = false; + for (AudioDeviceInfo info : audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)) { + switch (info.getType()) { + case AudioDeviceInfo.TYPE_BLUETOOTH_A2DP: + case AudioDeviceInfo.TYPE_BLUETOOTH_SCO: + hasBluetooth = true; + continue; + case AudioDeviceInfo.TYPE_WIRED_HEADSET: + hasHeadset = true; + continue; + default: + continue; + } + } + if (hasBluetooth) { + LogUtil.i("AudioModeProvider.getApproximatedAudioRoute", "Routing to bluetooth"); + return CallAudioState.ROUTE_BLUETOOTH; + } + if (hasHeadset) { + LogUtil.i("AudioModeProvider.getApproximatedAudioRoute", "Routing to headset"); + return CallAudioState.ROUTE_WIRED_HEADSET; + } + LogUtil.i("AudioModeProvider.getApproximatedAudioRoute", "Routing to earpiece"); + return CallAudioState.ROUTE_EARPIECE; + } + /** Notified on changes to audio mode. */ public interface AudioModeListener { -- cgit v1.2.3