Merge "Merge upstream SHA 04cb763"android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-release

am: 9a337512d9

* commit '9a337512d97e37afc142dee4fd50a41b741a87d2': (797 commits)
  Add tests for verifying transport feedback for audio and video.
  Eliminate defines in talk/
  Revert of Update with new default boringssl no-aes cipher suites. Re-enable tests. (patchset #3 id:40001 of https://codereview.webrtc.org/1550773002/ )
  Remove assert which was incorrectly added to TcpPort::OnSentPacket.
  Reland Connect TurnPort and TCPPort to AsyncPacketSocket::SignalSentPacket.
  Update with new default boringssl no-aes cipher suites. Re-enable tests.
  Revert of Connect TurnPort and TCPPort to AsyncPacketSocket::SignalSentPacket. (patchset #3 id:40001 of https://codereview.webrtc.org/1577873003/ )
  Re-land: "Use an explicit identifier in Config"
  Connect TurnPort and TCPPort to AsyncPacketSocket::SignalSentPacket.
  Revert of Delete remnants of non-square pixel support from cricket::VideoFrame. (patchset #1 id:1 of https://codereview.webrtc.org/1586613002/ )
  Remove libfuzzer trybot from default trybot set.
  Add ramp-up tests for transport sequence number with and w/o audio.
  Delete remnants of non-square pixel support from cricket::VideoFrame.
  Fix IPAddress::ToSensitiveString() to avoid dependency on inet_ntop().
  Revert of Storing raw audio sink for default audio track. (patchset #7 id:120001 of https://codereview.chromium.org/1551813002/ )
  Re-enable tests that failed under Linux_Msan.
  Revert of Use an explicit identifier in Config (patchset #4 id:60001 of https://codereview.webrtc.org/1538643004/ )
  Roll chromium_revision 346fea9..099be58 (369082:369139)
  Disable WebRtcVideoChannel2BaseTest.SendManyResizeOnce for TSan
  Add build_protobuf variable.
  ...

1 files changed, 0 insertions, 117 deletions

diff --git a/webrtc/examples/android/media_demo/src/org/webrtc/webrtcdemo/VoiceEngine.java b/webrtc/examples/android/media_demo/src/org/webrtc/webrtcdemo/VoiceEngine.java
deleted file mode 100644
index 900355ad8e..0000000000
--- a/webrtc/examples/android/media_demo/src/org/webrtc/webrtcdemo/VoiceEngine.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-package org.webrtc.webrtcdemo;
-
-public class VoiceEngine {
-  private final long nativeVoiceEngine;
-
-  // Keep in sync (including this comment) with
-  // webrtc/common_types.h:NsModes
-  public enum NsModes {
-    UNCHANGED, DEFAULT, CONFERENCE, LOW_SUPPRESSION,
-    MODERATE_SUPPRESSION, HIGH_SUPPRESSION, VERY_HIGH_SUPPRESSION
-  }
-
-  // Keep in sync (including this comment) with
-  // webrtc/common_types.h:AgcModes
-  public enum AgcModes {
-    UNCHANGED, DEFAULT, ADAPTIVE_ANALOG, ADAPTIVE_DIGITAL,
-    FIXED_DIGITAL
-  }
-
-  // Keep in sync (including this comment) with
-  // webrtc/common_types.h:AecmModes
-  public enum AecmModes {
-    QUIET_EARPIECE_OR_HEADSET, EARPIECE, LOUD_EARPIECE,
-    SPEAKERPHONE, LOUD_SPEAKERPHONE
-  }
-
-  // Keep in sync (including this comment) with
-  // webrtc/common_types.h:EcModes
-  public enum EcModes { UNCHANGED, DEFAULT, CONFERENCE, AEC, AECM }
-
-  // Keep in sync (including this comment) with
-  // webrtc/common_types.h:RtpDirections
-  public enum RtpDirections { INCOMING, OUTGOING }
-
-  public static class AgcConfig {
-    AgcConfig(int targetLevelDbOv, int digitalCompressionGaindB,
-        boolean limiterEnable) {
-      this.targetLevelDbOv = targetLevelDbOv;
-      this.digitalCompressionGaindB = digitalCompressionGaindB;
-      this.limiterEnable = limiterEnable;
-    }
-    private final int targetLevelDbOv;
-    private final int digitalCompressionGaindB;
-    private final boolean limiterEnable;
-  }
-
-  public VoiceEngine() {
-    nativeVoiceEngine = create();
-  }
-  private static native long create();
-  public native int init();
-  public native void dispose();
-  public native int createChannel();
-  public native int deleteChannel(int channel);
-  public native int setLocalReceiver(int channel, int port);
-  public native int setSendDestination(int channel, int port, String ipaddr);
-  public native int startListen(int channel);
-  public native int startPlayout(int channel);
-  public native int startSend(int channel);
-  public native int stopListen(int channel);
-  public native int stopPlayout(int channel);
-  public native int stopSend(int channel);
-  public native int setSpeakerVolume(int volume);
-  public native int setLoudspeakerStatus(boolean enable);
-  public native int startPlayingFileLocally(
-      int channel,
-      String fileName,
-      boolean loop);
-  public native int stopPlayingFileLocally(int channel);
-  public native int startPlayingFileAsMicrophone(
-      int channel,
-      String fileName,
-      boolean loop);
-  public native int stopPlayingFileAsMicrophone(int channel);
-  public native int numOfCodecs();
-  public native CodecInst getCodec(int index);
-  public native int setSendCodec(int channel, CodecInst codec);
-  public int setEcStatus(boolean enable, EcModes mode) {
-    return setEcStatus(enable, mode.ordinal());
-  }
-  private native int setEcStatus(boolean enable, int ec_mode);
-  public int setAecmMode(AecmModes aecm_mode, boolean cng) {
-    return setAecmMode(aecm_mode.ordinal(), cng);
-  }
-  private native int setAecmMode(int aecm_mode, boolean cng);
-  public int setAgcStatus(boolean enable, AgcModes agc_mode) {
-    return setAgcStatus(enable, agc_mode.ordinal());
-  }
-  private native int setAgcStatus(boolean enable, int agc_mode);
-  public native int setAgcConfig(AgcConfig agc_config);
-  public int setNsStatus(boolean enable, NsModes ns_mode) {
-    return setNsStatus(enable, ns_mode.ordinal());
-  }
-  private native int setNsStatus(boolean enable, int ns_mode);
-  public native int startDebugRecording(String file);
-  public native int stopDebugRecording();
-  public int startRtpDump(int channel, String file,
-      RtpDirections direction) {
-    return startRtpDump(channel, file, direction.ordinal());
-  }
-  private native int startRtpDump(int channel, String file,
-      int direction);
-  public int stopRtpDump(int channel, RtpDirections direction) {
-    return stopRtpDump(channel, direction.ordinal());
-  }
-  private native int stopRtpDump(int channel, int direction);
-}
\ No newline at end of file