Merge pull request #1864 from GerryFerdinandus/pr_fix_android_10_uplo…

…ad_exception Fix: Android 10 upload exception.
mozilla · Feb 9, 2021 · 7e553fb · 7e553fb
2 parents 40f8782 + 3998a0f
commit 7e553fb
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/...ies/stumbler/src/main/java/org/mozilla/mozstumbler/service/core/http/GlobalConstants.java b/...ies/stumbler/src/main/java/org/mozilla/mozstumbler/service/core/http/GlobalConstants.java
@@ -32,7 +32,15 @@ public class GlobalConstants {
     public static final String[] DEFAULT_PROTOCOLS;
 
     static {
-        if (Build.VERSION.SDK_INT >= 20) {
+        if (Build.VERSION.SDK_INT >= 29) {
+            DEFAULT_CIPHER_SUITES = new String[]
+                    {
+                            "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",     // 20+
+                            "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",        // 11+
+                            "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",     // 20+
+                            "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",        // 11+
+                    };
+        } else if (Build.VERSION.SDK_INT >= 20) {
             DEFAULT_CIPHER_SUITES = new String[]
                     {
                             "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",     // 20+