Skip direct map from apk check for Samsung Mega.

Avoid a warning from Samsung knox by skipping attempts to mmap
the apk file for UMA data.  Instead return false, appropriate
since any attempt later to really map the file would similarly
trigger this knox warning.

BUG=448084

Review URL: https://codereview.chromium.org/857833002

Cr-Commit-Position: refs/heads/master@{#312138}
(cherry picked from commit fba86e9cdbf10b89e6b644dbf1451cd67fa53e4f)

R=rmcilroy@chromium.org

Review URL: https://codereview.chromium.org/858983002

Cr-Commit-Position: refs/branch-heads/2272@{#56}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

1 files changed, 10 insertions, 0 deletions

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 d58d1fc..dfcc141 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();