diff --git a/play-services-ads-identifier/core/build.gradle b/play-services-ads-identifier/core/build.gradle index 9a2b7c8e4d..5b63bd545d 100644 --- a/play-services-ads-identifier/core/build.gradle +++ b/play-services-ads-identifier/core/build.gradle @@ -37,6 +37,6 @@ android { } lintOptions { - disable 'MissingTranslation' + disable 'MissingTranslation', 'GetLocales' } } diff --git a/play-services-auth-api-phone/core/build.gradle b/play-services-auth-api-phone/core/build.gradle index e6828fecb3..4530d26072 100644 --- a/play-services-auth-api-phone/core/build.gradle +++ b/play-services-auth-api-phone/core/build.gradle @@ -39,6 +39,6 @@ android { } lintOptions { - disable 'MissingTranslation' + disable 'MissingTranslation', 'GetLocales' } } diff --git a/play-services-base/core/src/main/java/org/microg/gms/common/DeviceConfiguration.java b/play-services-base/core/src/main/java/org/microg/gms/common/DeviceConfiguration.java index 98e334aad4..05473ca559 100644 --- a/play-services-base/core/src/main/java/org/microg/gms/common/DeviceConfiguration.java +++ b/play-services-base/core/src/main/java/org/microg/gms/common/DeviceConfiguration.java @@ -16,6 +16,7 @@ package org.microg.gms.common; +import android.annotation.SuppressLint; import android.app.ActivityManager; import android.content.Context; import android.content.pm.ConfigurationInfo; @@ -39,6 +40,8 @@ import javax.microedition.khronos.egl.EGLContext; import javax.microedition.khronos.egl.EGLDisplay; +import static android.os.Build.VERSION.SDK_INT; + public class DeviceConfiguration { public List availableFeatures; public int densityDpi; @@ -89,17 +92,28 @@ public DeviceConfiguration(Context context) { this.nativePlatforms = getNativePlatforms(); widthPixels = displayMetrics.widthPixels; heightPixels = displayMetrics.heightPixels; - locales = new ArrayList(Arrays.asList(context.getAssets().getLocales())); - for (int i = 0; i < locales.size(); i++) { - locales.set(i, locales.get(i).replace("-", "_")); - } - Collections.sort(locales); + locales = getLocales(context); Set glExtensions = new HashSet(); addEglExtensions(glExtensions); this.glExtensions = new ArrayList(glExtensions); Collections.sort(this.glExtensions); } + @SuppressLint("GetLocales") + private static List getLocales(Context context) { + List locales = new ArrayList(); + if (SDK_INT >= 21) { + locales.addAll(Arrays.asList(context.getAssets().getLocales())); + } else { + locales.add("en-US"); + } + for (int i = 0; i < locales.size(); i++) { + locales.set(i, locales.get(i).replace("-", "_")); + } + Collections.sort(locales); + return locales; + } + @SuppressWarnings({"deprecation", "InlinedApi"}) private static List getNativePlatforms() { List nativePlatforms; diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index 9dd45b4dd3..20cb3db9ec 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -129,7 +129,7 @@ android { } lintOptions { - disable 'MissingTranslation', 'InvalidPackage', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity', 'InvalidWakeLockTag', 'UniquePermission' + disable 'MissingTranslation', 'GetLocales', 'InvalidPackage', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity', 'InvalidWakeLockTag', 'UniquePermission' } buildTypes { diff --git a/play-services-droidguard/core/build.gradle b/play-services-droidguard/core/build.gradle index e5835c02a2..c6e5d079aa 100644 --- a/play-services-droidguard/core/build.gradle +++ b/play-services-droidguard/core/build.gradle @@ -54,7 +54,7 @@ android { } lintOptions { - disable 'MissingTranslation' + disable 'MissingTranslation', 'GetLocales' } compileOptions { diff --git a/play-services-fido/core/build.gradle b/play-services-fido/core/build.gradle index babf3419ba..157e0643d8 100644 --- a/play-services-fido/core/build.gradle +++ b/play-services-fido/core/build.gradle @@ -55,7 +55,7 @@ android { } lintOptions { - disable 'MissingTranslation' + disable 'MissingTranslation', 'GetLocales' } compileOptions { diff --git a/play-services-location/core/build.gradle b/play-services-location/core/build.gradle index 16b5b9aee1..e449c1da6c 100644 --- a/play-services-location/core/build.gradle +++ b/play-services-location/core/build.gradle @@ -46,7 +46,7 @@ android { } lintOptions { - disable 'MissingTranslation' + disable 'MissingTranslation', 'GetLocales' } flavorDimensions = ['target'] diff --git a/play-services-nearby/core/build.gradle b/play-services-nearby/core/build.gradle index 82be204fc3..516a65316a 100644 --- a/play-services-nearby/core/build.gradle +++ b/play-services-nearby/core/build.gradle @@ -53,7 +53,7 @@ android { } lintOptions { - disable 'MissingTranslation' + disable 'MissingTranslation', 'GetLocales' } compileOptions {