Merge branch 'release-agua' into tvn-merge-releaseupstream/tvn-merge-release

1 files changed, 8 insertions, 1 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java
index e2626a026b..32aa250997 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java
@@ -85,7 +85,14 @@ class HTTPRequest implements Callback {
       }
       mRequest = builder.build();
       mCall = mClient.newCall(mRequest);
-      mCall.enqueue(this);
+
+      // TODO remove code block for workaround in #10303
+      if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.N_MR1) {
+        mCall.enqueue(this);
+      } else {
+        // Calling execute instead of enqueue is a workaround for #10303
+        onResponse(mCall, mCall.execute());
+      }
     } catch (Exception exception) {
       onFailure(exception);
     }