Commit 4d62f4f6 authored by kapishnikov's avatar kapishnikov Committed by Commit Bot

Don't load cronet provider from resource if it is a well-known provider

Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester
Change-Id: I6f6ce3b6bb80481c5862d44d36b7cb8590c57870
Reviewed-on: https://chromium-review.googlesource.com/1059730
Commit-Queue: Andrei Kapishnikov <kapishnikov@chromium.org>
Commit-Queue: Paul Jensen <pauljensen@chromium.org>
Reviewed-by: default avatarPaul Jensen <pauljensen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558780}
parent 418376ae
...@@ -226,6 +226,15 @@ public abstract class CronetProvider { ...@@ -226,6 +226,15 @@ public abstract class CronetProvider {
} }
String className = context.getResources().getString(resId); String className = context.getResources().getString(resId);
// If the resource specifies a well known provider, don't load it because
// there will be an attempt to load it anyways.
if (className == null || className.equals(PLAY_SERVICES_CRONET_PROVIDER_CLASS)
|| className.equals(GMS_CORE_CRONET_PROVIDER_CLASS)
|| className.equals(JAVA_CRONET_PROVIDER_CLASS)
|| className.equals(NATIVE_CRONET_PROVIDER_CLASS)) {
return false;
}
if (!addCronetProviderImplByClassName(context, className, providers, true)) { if (!addCronetProviderImplByClassName(context, className, providers, true)) {
Log.e(TAG, Log.e(TAG,
"Unable to instantiate Cronet implementation class " + className "Unable to instantiate Cronet implementation class " + className
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment