Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1610)

Unified Diff: base/android/java/src/org/chromium/base/library_loader/Linker.java

Issue 862133002: Update from https://crrev.com/312398 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/android/java/src/org/chromium/base/library_loader/Linker.java
diff --git a/base/android/java/src/org/chromium/base/library_loader/Linker.java b/base/android/java/src/org/chromium/base/library_loader/Linker.java
index d58d1fc28e2d173e192e8c9d7a40398ba7c09c09..dfcc14156bbdc857e8d1efea52ea498fafc44d24 100644
--- a/base/android/java/src/org/chromium/base/library_loader/Linker.java
+++ b/base/android/java/src/org/chromium/base/library_loader/Linker.java
@@ -845,6 +845,16 @@ public class Linker {
*/
public static boolean checkMapExecSupport(String apkFile) {
assert apkFile != null;
+
+ // https://code.google.com/p/chromium/issues/detail?id=448084
+ // Do not check if the device is Samsung Mega.
+ final String model = android.os.Build.MODEL;
+ if (model != null && model.equals("GT-I9205")) {
+ if (DEBUG) Log.i(TAG, "checkMapExecSupport: model is '" + model
+ + "', returning false");
+ return false;
+ }
+
synchronized (Linker.class) {
ensureInitializedLocked();

Powered by Google App Engine
This is Rietveld 408576698