Fix low-memory devices crashing on Chrome start up during UMA recodring

base/android/java/src/org/chromium/base/library_loader/Linker.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.base.library_loader;
 
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.ParcelFileDescriptor;
 import android.os.Parcelable;
@@ skipping 178 matching lines @@
     // for testing by calling setMemoryDeviceConfig().
     private static int sMemoryDeviceConfig = MEMORY_DEVICE_CONFIG_INIT;
 
     // Becomes true after linker initialization.
     private static boolean sInitialized = false;
 
     // Set to true to indicate that the system supports safe sharing of RELRO sections.
     private static boolean sRelroSharingSupported = false;
 
     // Set to true if this runs in the browser process. Disabled by initServiceProcess().
+    // TODO(petrcermak): This flag can be incorrectly set to false (even though this might run in
+    // the browser process) on low-memory devices.
     private static boolean sInBrowserProcess = true;
 
     // Becomes true to indicate this process needs to wait for a shared RELRO in
     // finishLibraryLoad().
     private static boolean sWaitForSharedRelros = false;
 
     // Becomes true when initialization determines that the browser process can use the
     // shared RELRO.
     private static boolean sBrowserUsesSharedRelro = false;
 
@@ skipping 166 matching lines @@
      * for the browser process.
      */
     public static boolean isUsingBrowserSharedRelros() {
         synchronized (Linker.class) {
             ensureInitializedLocked();
             return sBrowserUsesSharedRelro;
         }
     }
 
     /**
-     * Call this method to determine if the linker is running in the browser
-     * process.
-     *
-     * @return true if the linker is running in the browser process.
-     */
-    public static boolean isInBrowserProcess() {
-        synchronized (Linker.class) {
-            ensureInitializedLocked();
-            return sInBrowserProcess;
-        }
-    }
-
-    /**
      * Call this method to determine if the chromium project must load
      * the library directly from the zip file.
      */
     public static boolean isInZipFile() {
         return NativeLibraries.sUseLibraryInZipFile;
     }
 
     /**
      * Call this method just before loading any native shared libraries in this process.
      */
@@ skipping 420 matching lines @@
             }
 
             sLoadedLibraries.put(libName, libInfo);
             if (DEBUG) Log.i(TAG, "Library details " + libInfo.toString());
         }
     }
 
     /**
      * Check whether the device supports loading a library directly from the APK file.
      *
-     * @param apkFile Filename of the APK.
+     * @param apkFile Filename of the APK (not null).

[rmcilroy, 2014/10/20 10:42:39]

this is usually implied (with params which can be null marked as such instead).

[petrcermak, 2014/10/20 15:33:22]

Removed.

      * @return true if supported.
      */
     public static boolean checkLibraryLoadFromApkSupport(String apkFile) {
+        assert apkFile != null;
         synchronized (Linker.class) {
             ensureInitializedLocked();
 
             if (DEBUG) Log.i(TAG, "checkLibraryLoadFromApkSupported: " + apkFile);
             boolean supported = nativeCheckLibraryLoadFromApkSupport(apkFile);
             if (DEBUG) Log.i(TAG, "Loading a library directly from the APK file " +
                     (supported ? "" : "NOT ") + "supported");
             return supported;
         }
     }
@@ skipping 233 matching lines @@
         }
     }
 
     // The map of libraries that are currently loaded in this process.
     private static HashMap<String, LibInfo> sLoadedLibraries = null;
 
     // Used to pass the shared RELRO Bundle through Binder.
     public static final String EXTRA_LINKER_SHARED_RELROS =
         "org.chromium.base.android.linker.shared_relros";
 }