diff --git a/src/com/android/server/telecom/CallAudioManager.java b/src/com/android/server/telecom/CallAudioManager.java
index aed592d..0078765 100644
--- a/src/com/android/server/telecom/CallAudioManager.java
+++ b/src/com/android/server/telecom/CallAudioManager.java
@@ -191,12 +191,12 @@
         if (isDocked) {
             // Device just docked, turn to speakerphone. Only do so if the route is currently
             // earpiece so that we dont switch out of a BT headset or a wired headset.
-            if (mAudioState.route == AudioState.ROUTE_EARPIECE) {
+            if (mAudioState.getRoute() == AudioState.ROUTE_EARPIECE) {
                 setAudioRoute(AudioState.ROUTE_SPEAKER);
             }
         } else {
             // Device just undocked, remove from speakerphone if possible.
-            if (mAudioState.route == AudioState.ROUTE_SPEAKER) {
+            if (mAudioState.getRoute() == AudioState.ROUTE_SPEAKER) {
                 setAudioRoute(AudioState.ROUTE_WIRED_OR_EARPIECE);
             }
         }
diff --git a/tests/src/com/android/server/telecom/testapps/TestVideoProvider.java b/tests/src/com/android/server/telecom/testapps/TestVideoProvider.java
index 494eacc..1e1c30c 100644
--- a/tests/src/com/android/server/telecom/testapps/TestVideoProvider.java
+++ b/tests/src/com/android/server/telecom/testapps/TestVideoProvider.java
@@ -327,7 +327,7 @@
                     CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
             Size previewSize = map.getOutputSizes(SurfaceTexture.class)[0];
 
-            mCameraCapabilities = new CameraCapabilities(true, 1.0f, previewSize.getWidth(),
+            mCameraCapabilities = new CameraCapabilities(previewSize.getWidth(),
                     previewSize.getHeight());
         }
     }