From ed1023db0eb81f7fd27e487eba2a811db99a6e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20Kalliom=C3=A4ki?= Date: Mon, 20 Nov 2017 14:38:19 +0100 Subject: [PATCH] Android: Disable internal tracer by default. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a debug feature and should be disabled by default. Any client that needs this functionality should call setEnableInternalTracer. Bug: webrtc:8553 Change-Id: I78d718ebb95fc5cb8c464327b5b36e385ccfa9c0 Reviewed-on: https://webrtc-review.googlesource.com/24540 Commit-Queue: Sami Kalliomäki Reviewed-by: Magnus Jedvert Cr-Commit-Position: refs/heads/master@{#20814} --- .../androidapp/src/org/appspot/apprtc/PeerConnectionClient.java | 2 +- sdk/android/api/org/webrtc/PeerConnectionFactory.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java b/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java index e4cd937394..b641555143 100644 --- a/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java +++ b/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.Iterator; -import java.util.ArrayList; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -427,6 +426,7 @@ public class PeerConnectionClient { PeerConnectionFactory.InitializationOptions.builder(context) .setFieldTrials(fieldTrials) .setEnableVideoHwAcceleration(peerConnectionParameters.videoCodecHwAcceleration) + .setEnableInternalTracer(true) .createInitializationOptions()); if (peerConnectionParameters.tracing) { PeerConnectionFactory.startInternalTracingCapture( diff --git a/sdk/android/api/org/webrtc/PeerConnectionFactory.java b/sdk/android/api/org/webrtc/PeerConnectionFactory.java index de09a7c79d..d91150421b 100644 --- a/sdk/android/api/org/webrtc/PeerConnectionFactory.java +++ b/sdk/android/api/org/webrtc/PeerConnectionFactory.java @@ -63,7 +63,7 @@ public class PeerConnectionFactory { public static class Builder { private final Context applicationContext; private String fieldTrials = ""; - private boolean enableInternalTracer = true; + private boolean enableInternalTracer = false; private boolean enableVideoHwAcceleration = true; private NativeLibraryLoader nativeLibraryLoader = new NativeLibrary.DefaultLoader();