| Index: net/android/network_change_notifier_delegate_android.cc
|
| diff --git a/net/android/network_change_notifier_delegate_android.cc b/net/android/network_change_notifier_delegate_android.cc
|
| index ec8a7294995876b4ca09150171f0d1263d97d3f2..be4c6b18e1112853221016ba5a97d90591de13d6 100644
|
| --- a/net/android/network_change_notifier_delegate_android.cc
|
| +++ b/net/android/network_change_notifier_delegate_android.cc
|
| @@ -84,9 +84,13 @@ NetworkChangeNotifierDelegateAndroid::GetCurrentConnectionType() const {
|
| return connection_type_;
|
| }
|
|
|
| -double NetworkChangeNotifierDelegateAndroid::GetCurrentMaxBandwidth() const {
|
| +void NetworkChangeNotifierDelegateAndroid::
|
| + GetCurrentMaxBandwidthAndConnectionType(
|
| + double* max_bandwidth_mbps,
|
| + ConnectionType* connection_type) const {
|
| base::AutoLock auto_lock(connection_lock_);
|
| - return connection_max_bandwidth_;
|
| + *connection_type = connection_type_;
|
| + *max_bandwidth_mbps = connection_max_bandwidth_;
|
| }
|
|
|
| void NetworkChangeNotifierDelegateAndroid::NotifyConnectionTypeChanged(
|
| @@ -111,10 +115,10 @@ void NetworkChangeNotifierDelegateAndroid::NotifyMaxBandwidthChanged(
|
| jobject obj,
|
| jdouble new_max_bandwidth) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| - DCHECK(new_max_bandwidth != GetCurrentMaxBandwidth());
|
| +
|
| SetCurrentMaxBandwidth(new_max_bandwidth);
|
| observers_->Notify(FROM_HERE, &Observer::OnMaxBandwidthChanged,
|
| - new_max_bandwidth);
|
| + new_max_bandwidth, GetCurrentConnectionType());
|
| }
|
|
|
| void NetworkChangeNotifierDelegateAndroid::AddObserver(
|
|
|