| Index: components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java
|
| diff --git a/components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java b/components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java
|
| index e1035c47f58a0088b4efac593beb52c0edc9b51a..de116d8471b858170dc579ae57964071ab0ea68b 100644
|
| --- a/components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java
|
| +++ b/components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java
|
| @@ -62,7 +62,7 @@ public class CronetUrlRequestContext extends CronetEngine {
|
| private final AtomicInteger mActiveRequestCount = new AtomicInteger(0);
|
|
|
| private long mUrlRequestContextAdapter = 0;
|
| - private Thread mNetworkThread;
|
| + private volatile Thread mNetworkThread;
|
|
|
| private boolean mNetworkQualityEstimatorEnabled;
|
|
|
| @@ -182,7 +182,7 @@ public class CronetUrlRequestContext extends CronetEngine {
|
| @Override
|
| public UrlRequest createRequest(String url, UrlRequest.Callback callback, Executor executor,
|
| int priority, Collection<Object> requestAnnotations, boolean disableCache,
|
| - boolean disableConnectionMigration) {
|
| + boolean disableConnectionMigration, boolean allowDirectExecutor) {
|
| synchronized (mLock) {
|
| checkHaveAdapter();
|
| boolean metricsCollectionEnabled = false;
|
| @@ -190,7 +190,8 @@ public class CronetUrlRequestContext extends CronetEngine {
|
| metricsCollectionEnabled = !mFinishedListenerList.isEmpty();
|
| }
|
| return new CronetUrlRequest(this, url, priority, callback, executor, requestAnnotations,
|
| - metricsCollectionEnabled, disableCache, disableConnectionMigration);
|
| + metricsCollectionEnabled, disableCache, disableConnectionMigration,
|
| + allowDirectExecutor);
|
| }
|
| }
|
|
|
| @@ -492,10 +493,8 @@ public class CronetUrlRequestContext extends CronetEngine {
|
| @SuppressWarnings("unused")
|
| @CalledByNative
|
| private void initNetworkThread() {
|
| - synchronized (mLock) {
|
| - mNetworkThread = Thread.currentThread();
|
| - mInitCompleted.open();
|
| - }
|
| + mNetworkThread = Thread.currentThread();
|
| + mInitCompleted.open();
|
| Thread.currentThread().setName("ChromiumNet");
|
| Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
|
| }
|
| @@ -626,4 +625,8 @@ public class CronetUrlRequestContext extends CronetEngine {
|
|
|
| @NativeClassQualifiedName("CronetURLRequestContextAdapter")
|
| private native void nativeProvideThroughputObservations(long nativePtr, boolean should);
|
| +
|
| + public boolean isNetworkThread(Thread thread) {
|
| + return thread == mNetworkThread;
|
| + }
|
| }
|
|
|