Add check for Java VM in Android's SysInfo::IsLowEndDevice()

base/sys_info_android.cc

 // Copyright (c) 2012 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.
 
 #include "base/sys_info.h"
 
 #include <dlfcn.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/system_properties.h>
 
+#include "base/android/jni_android.h"
 #include "base/android/sys_utils.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info_internal.h"
 
 #if (__ANDROID_API__ >= 21 /* 5.0 - Lollipop */)
 
@@ skipping 186 matching lines @@
   static int heap_growth_limit = GetDalvikHeapGrowthLimitMB();
   return heap_growth_limit;
 }
 
 static base::LazyInstance<
     base::internal::LazySysInfoValue<bool,
         android::SysUtils::IsLowEndDeviceFromJni> >::Leaky
     g_lazy_low_end_device = LAZY_INSTANCE_INITIALIZER;
 
 bool SysInfo::IsLowEndDevice() {
+  // This code might be used in some environments
+  // which might not have a Java environment.
+  // Note that we need to call the Java version here.
+  // There exists a complete native implementation in
+  // sys_info.cc but calling that here would mean that
+  // the Java code and the native code would call different
+  // implementations which could give different results.
+  // Also the Java code cannot depend on the native code
+  // since it might not be loaded yet.
+  if (!base::android::IsVMInitialized())
+    return false;
   return g_lazy_low_end_device.Get().value();
 }
 
 
 }  // namespace base