diff options
| author | Sailesh Nepal <sail@google.com> | 2016-02-21 13:43:45 -0800 |
|---|---|---|
| committer | Sailesh Nepal <sail@google.com> | 2016-02-22 12:40:45 -0800 |
| commit | e4be64852dac9e2c55ce8dd5b7063b0c21b9700e (patch) | |
| tree | f45747e3fd824f97b8f8ccf9254b9533f5deb83d /InCallUI/src/com/android/incallui/ProximitySensor.java | |
| parent | 68d86c656e5522dec1b04e85ebc0e0f78e436c3d (diff) | |
Remove CallAudioStateCompat
Now that we're no longer backwards compatible with Lollipop we don't
need CallAudioStateCompat. See ag/870962 for more info.
Bug: 26676586
Change-Id: I7c754d89a6c9e13bf5a004b7c5b15b88b9aff9ad
Diffstat (limited to 'InCallUI/src/com/android/incallui/ProximitySensor.java')
| -rw-r--r-- | InCallUI/src/com/android/incallui/ProximitySensor.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/InCallUI/src/com/android/incallui/ProximitySensor.java b/InCallUI/src/com/android/incallui/ProximitySensor.java index 733a67d5d..3c9fd9370 100644 --- a/InCallUI/src/com/android/incallui/ProximitySensor.java +++ b/InCallUI/src/com/android/incallui/ProximitySensor.java @@ -23,9 +23,9 @@ import android.content.res.Configuration; import android.hardware.display.DisplayManager; import android.hardware.display.DisplayManager.DisplayListener; import android.os.PowerManager; +import android.telecom.CallAudioState; import android.view.Display; -import com.android.dialer.compat.CallAudioStateCompat; import com.android.incallui.AudioModeProvider.AudioModeListener; import com.android.incallui.InCallPresenter.InCallState; import com.android.incallui.InCallPresenter.InCallStateListener; @@ -228,9 +228,9 @@ public class ProximitySensor implements AccelerometerListener.OrientationListene // turn proximity sensor off and turn screen on immediately if // we are using a headset, the keyboard is open, or the device // is being held in a horizontal position. - boolean screenOnImmediately = (CallAudioStateCompat.ROUTE_WIRED_HEADSET == audioMode - || CallAudioStateCompat.ROUTE_SPEAKER == audioMode - || CallAudioStateCompat.ROUTE_BLUETOOTH == audioMode + boolean screenOnImmediately = (CallAudioState.ROUTE_WIRED_HEADSET == audioMode + || CallAudioState.ROUTE_SPEAKER == audioMode + || CallAudioState.ROUTE_BLUETOOTH == audioMode || mIsHardKeyboardOpen); // We do not keep the screen off when the user is outside in-call screen and we are @@ -254,7 +254,7 @@ public class ProximitySensor implements AccelerometerListener.OrientationListene .add("offhook", mIsPhoneOffhook ? 1 : 0) .add("hor", horizontal ? 1 : 0) .add("ui", mUiShowing ? 1 : 0) - .add("aud", CallAudioStateCompat.audioRouteToString(audioMode)) + .add("aud", CallAudioState.audioRouteToString(audioMode)) .toString()); if (mIsPhoneOffhook && !screenOnImmediately) { |