Expose effective connection type to Cronet

components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.net;
 
 import android.content.Context;
 import android.os.Build;
 import android.os.ConditionVariable;
 import android.os.Handler;
@@ skipping 46 matching lines @@
 
     private Executor mNetworkQualityExecutor;
     private boolean mNetworkQualityEstimatorEnabled;
 
     /** Locks operations on network quality listeners, because listener
      * addition and removal may occur on a different thread from notification.
      */
     private final Object mNetworkQualityLock = new Object();
 
     @GuardedBy("mNetworkQualityLock")
+    // Current effective connection type as computed by the network quality
+    // estimator.
+    private int mEffectiveConnectionType =
+            EffectiveConnectionType.EFFECTIVE_CONNECTION_TYPE_UNKNOWN;
+
+    @GuardedBy("mNetworkQualityLock")
     private final ObserverList<NetworkQualityRttListener> mRttListenerList =
             new ObserverList<NetworkQualityRttListener>();
 
     @GuardedBy("mNetworkQualityLock")
     private final ObserverList<NetworkQualityThroughputListener> mThroughputListenerList =
             new ObserverList<NetworkQualityThroughputListener>();
 
     @GuardedBy("mNetworkQualityLock")
     private final ObserverList<RequestFinishedListener> mFinishedListenerList =
             new ObserverList<RequestFinishedListener>();
@@ skipping 184 matching lines @@
         }
         if (executor == null) {
             throw new NullPointerException("Request finished listener requires an executor");
         }
         if (mNetworkQualityExecutor != null) {
             throw new NullPointerException("Request finished listener executor already set");
         }
         mNetworkQualityExecutor = executor;
     }
 
+    @Override
+    public int getEffectiveConnectionType() {
+        if (!mNetworkQualityEstimatorEnabled) {
+            throw new IllegalStateException("Network quality estimator must be enabled");
+        }
+        synchronized (mNetworkQualityLock) {
+            checkHaveAdapter();
+            return mEffectiveConnectionType;
+        }
+    }
+
     /**
      * TODO(tbansal):  http://crbug.com/618034 Remove this API once all
      * embedders have switched to using CronetEngine builder for enabling
      * network quality estimator.
      */
     @Override
     public void enableNetworkQualityEstimator(Executor executor) {
         if (mNetworkQualityEstimatorEnabled) {
             throw new IllegalStateException("Network quality estimator already enabled");
         }
@@ skipping 199 matching lines @@
         synchronized (mLock) {
             mNetworkThread = Thread.currentThread();
             mInitCompleted.open();
         }
         Thread.currentThread().setName("ChromiumNet");
         Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
     }
 
     @SuppressWarnings("unused")
     @CalledByNative
+    private void onEffectiveConnectionTypeChanged(int effectiveConnectionType) {
+        synchronized (mNetworkQualityLock) {
+            mEffectiveConnectionType = effectiveConnectionType;
+        }
+    }
+
+    @SuppressWarnings("unused")
+    @CalledByNative
     private void onRttObservation(final int rttMs, final long whenMs, final int source) {
         synchronized (mNetworkQualityLock) {
             for (final NetworkQualityRttListener listener : mRttListenerList) {
                 Runnable task = new Runnable() {
                     @Override
                     public void run() {
                         listener.onRttObservation(rttMs, whenMs, source);
                     }
                 };
                 // Use the executor provided by the listener. If not available,
@@ skipping 112 matching lines @@
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeEnableNetworkQualityEstimator(long nativePtr);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeProvideRTTObservations(long nativePtr, boolean should);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeProvideThroughputObservations(long nativePtr, boolean should);
 }