| Index: base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
|
| diff --git a/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java b/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
|
| index 602358b8e4145dbfac210f73623b12f07e36235b..2168c21827fddcd17c1d7d2f5de4d0dd17155a62 100644
|
| --- a/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
|
| +++ b/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
|
| @@ -175,18 +175,12 @@ public class LibraryLoader {
|
| String apkFilePath = null;
|
| boolean useMapExecSupportFallback = false;
|
|
|
| - // If the Android build version pre-dates KitKat and the device
|
| - // manufacturer is Samsung, skip the check for mmap exec support and
|
| - // return false. This avoids triggering a warning on these devices.
|
| - // The version check is included because these devices do not show
|
| - // the warning on later OS builds.
|
| + // If manufacturer is Samsung then skip the mmap exec check.
|
| //
|
| // For more, see:
|
| // https://code.google.com/p/chromium/issues/detail?id=448084
|
| final String manufacturer = android.os.Build.MANUFACTURER;
|
| - final int version = android.os.Build.VERSION.SDK_INT;
|
| if (manufacturer != null
|
| - && version < android.os.Build.VERSION_CODES.KITKAT
|
| && manufacturer.toLowerCase(Locale.ENGLISH).contains("samsung")) {
|
| Log.w(TAG, "Suppressed load from APK support check on this device");
|
| sProbeMapApkWithExecPermission = false;
|
|
|