zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "WebRTC-DeprecateGlobalFieldTrialString/Enabled/ - part 14/inf"

Browse Source 
This reverts commit f177081eeeab64658fb560b6e8cb235620ac4a1a.

Reason for revert: breaks downstream project

Original change's description:
> WebRTC-DeprecateGlobalFieldTrialString/Enabled/ - part 14/inf
>
> This cl/ passes field trials all the way from c++
> to the android NetworkMonitorAutoDetect.java
>
> Bug: webrtc:10335
> Change-Id: Ic6842612eed36b684340f0f78f4087bee249cc50
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/257081
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Reviewed-by: Florent Castelli <orphis@webrtc.org>
> Commit-Queue: Jonas Oreland <jonaso@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#36498}

Bug: webrtc:10335
Change-Id: I8d881ea3f50cf4affde65800d759885b2581c6be
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/258482
Reviewed-by: Jonas Oreland <jonaso@google.com>
Owners-Override: Artem Titov <titovartem@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#36500}
This commit is contained in:
Artem Titov
2022-04-08 15:09:03 +00:00
committed by WebRTC LUCI CQ
parent bb877d25c2
commit 54714779b2
8 changed files with 56 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sdk/android/src/jni/android_network_monitor.cc
View File

@ -28,6 +28,7 @@
#include "sdk/android/generated_base_jni/NetworkMonitor_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
#include "system_wrappers/include/field_trial.h"
namespace webrtc {
namespace jni {
@ -226,13 +227,11 @@ std::string NetworkInformation::ToString() const {
AndroidNetworkMonitor::AndroidNetworkMonitor(
JNIEnv* env,
const JavaRef<jobject>& j_application_context,
const FieldTrialsView& field_trials)
const JavaRef<jobject>& j_application_context)
: android_sdk_int_(Java_NetworkMonitor_androidSdkInt(env)),
j_application_context_(env, j_application_context),
j_network_monitor_(env, Java_NetworkMonitor_getInstance(env)),
network_thread_(rtc::Thread::Current()),
field_trials_(field_trials) {}
network_thread_(rtc::Thread::Current()) {}
AndroidNetworkMonitor::~AndroidNetworkMonitor() {
RTC_DCHECK(!started_);
@ -245,12 +244,13 @@ void AndroidNetworkMonitor::Start() {
}
started_ = true;
surface_cellular_types_ =
field_trials_.IsEnabled("WebRTC-SurfaceCellularTypes");
find_network_handle_without_ipv6_temporary_part_ = field_trials_.IsEnabled(
"WebRTC-FindNetworkHandleWithoutIpv6TemporaryPart");
webrtc::field_trial::IsEnabled("WebRTC-SurfaceCellularTypes");
find_network_handle_without_ipv6_temporary_part_ =
webrtc::field_trial::IsEnabled(
"WebRTC-FindNetworkHandleWithoutIpv6TemporaryPart");
bind_using_ifname_ =
!field_trials_.IsDisabled("WebRTC-BindUsingInterfaceName");
disable_is_adapter_available_ = field_trials_.IsDisabled(
!webrtc::field_trial::IsDisabled("WebRTC-BindUsingInterfaceName");
disable_is_adapter_available_ = webrtc::field_trial::IsDisabled(
"WebRTC-AndroidNetworkMonitor-IsAdapterAvailable");
// This pointer is also accessed by the methods called from java threads.
@ -260,9 +260,7 @@ void AndroidNetworkMonitor::Start() {
JNIEnv* env = AttachCurrentThreadIfNeeded();
Java_NetworkMonitor_startMonitoring(
env, j_network_monitor_, j_application_context_, jlongFromPointer(this),
NativeToJavaString(
env, field_trials_.Lookup("WebRTC-NetworkMonitorAutoDetect")));
env, j_network_monitor_, j_application_context_, jlongFromPointer(this));
}
void AndroidNetworkMonitor::Stop() {
@ -610,7 +608,7 @@ rtc::NetworkMonitorInterface*
AndroidNetworkMonitorFactory::CreateNetworkMonitor(
const FieldTrialsView& field_trials) {
return new AndroidNetworkMonitor(AttachCurrentThreadIfNeeded(),
j_application_context_, field_trials);
j_application_context_);
}
void AndroidNetworkMonitor::NotifyConnectionTypeChanged(

5
sdk/android/src/jni/android_network_monitor.h
View File

@ -70,8 +70,7 @@ struct NetworkInformation {
class AndroidNetworkMonitor : public rtc::NetworkMonitorInterface {
public:
AndroidNetworkMonitor(JNIEnv* env,
const JavaRef<jobject>& j_application_context,
const FieldTrialsView& field_trials);
const JavaRef<jobject>& j_application_context);
~AndroidNetworkMonitor() override;
// TODO(sakal): Remove once down stream dependencies have been updated.
@ -161,8 +160,6 @@ class AndroidNetworkMonitor : public rtc::NetworkMonitorInterface {
rtc::scoped_refptr<PendingTaskSafetyFlag> safety_flag_
RTC_PT_GUARDED_BY(network_thread_) = nullptr;
const FieldTrialsView& field_trials_;
};
class AndroidNetworkMonitorFactory : public rtc::NetworkMonitorFactory {