2 files changed, 7 insertions, 6 deletions

diff --git a/modules/audio_coding/main/test/initial_delay_unittest.cc b/modules/audio_coding/main/test/initial_delay_unittest.cc
index 538734cc..3a08dea4 100644
--- a/modules/audio_coding/main/test/initial_delay_unittest.cc
+++ b/modules/audio_coding/main/test/initial_delay_unittest.cc
@@ -130,38 +130,38 @@ class InitialPlayoutDelayTest : public ::testing::Test {
   Channel* channel_a2b_;
 };
 
-TEST_F( InitialPlayoutDelayTest, NbMono) {
+TEST_F( InitialPlayoutDelayTest, DISABLED_ON_ANDROID(NbMono)) {
   CodecInst codec;
   AudioCodingModule::Codec("L16", &codec, 8000, 1);
   Run(codec, 3000);
 }
 
-TEST_F( InitialPlayoutDelayTest, WbMono) {
+TEST_F( InitialPlayoutDelayTest, DISABLED_ON_ANDROID(WbMono)) {
   CodecInst codec;
   AudioCodingModule::Codec("L16", &codec, 16000, 1);
   Run(codec, 3000);
 }
 
-TEST_F( InitialPlayoutDelayTest, SwbMono) {
+TEST_F( InitialPlayoutDelayTest, DISABLED_ON_ANDROID(SwbMono)) {
   CodecInst codec;
   AudioCodingModule::Codec("L16", &codec, 32000, 1);
   Run(codec, 2000);  // NetEq buffer is not sufficiently large for 3 sec of
                      // PCM16 super-wideband.
 }
 
-TEST_F( InitialPlayoutDelayTest, NbStereo) {
+TEST_F( InitialPlayoutDelayTest, DISABLED_ON_ANDROID(NbStereo)) {
   CodecInst codec;
   AudioCodingModule::Codec("L16", &codec, 8000, 2);
   Run(codec, 3000);
 }
 
-TEST_F( InitialPlayoutDelayTest, WbStereo) {
+TEST_F( InitialPlayoutDelayTest, DISABLED_ON_ANDROID(WbStereo)) {
   CodecInst codec;
   AudioCodingModule::Codec("L16", &codec, 16000, 2);
   Run(codec, 3000);
 }
 
-TEST_F( InitialPlayoutDelayTest, SwbStereo) {
+TEST_F( InitialPlayoutDelayTest, DISABLED_ON_ANDROID(SwbStereo)) {
   CodecInst codec;
   AudioCodingModule::Codec("L16", &codec, 32000, 2);
   Run(codec, 2000);  // NetEq buffer is not sufficiently large for 3 sec of
diff --git a/voice_engine/voe_video_sync_impl.cc b/voice_engine/voe_video_sync_impl.cc
index 4645e252..cd377eb8 100644
--- a/voice_engine/voe_video_sync_impl.cc
+++ b/voice_engine/voe_video_sync_impl.cc
@@ -145,6 +145,7 @@ int VoEVideoSyncImpl::SetInitialPlayoutDelay(int channel, int delay_ms)
     WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
                  "SetInitialPlayoutDelay(channel=%d, delay_ms=%d)",
                  channel, delay_ms);
+    ANDROID_NOT_SUPPORTED(_shared->statistics());
     IPHONE_NOT_SUPPORTED(_shared->statistics());
 
     if (!_shared->statistics().Initialized())