commit afb2e7813f11ba8017e8394e32e8529b666d100a
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Fri May 13 12:26:22 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 13 12:26:22 2016 +0000
tree a431c3c689498ca0ed3b9b270488b9c3718e155e
parent 628f2017fcc64352a2297a802c10ea7100fbd74b
parent a2b147eaf72c5af23302a382620360b4cac28934

Merge "Ensure that java.lang.reflect.Field is initialized"

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 45ba7d0..ca8f8bb 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -577,9 +577,14 @@
 
   if (!IsImageDex2OatEnabled() || !GetHeap()->HasBootImageSpace()) {
     ScopedObjectAccess soa(self);
-    StackHandleScope<1> hs(soa.Self());
-    auto klass(hs.NewHandle<mirror::Class>(mirror::Class::GetJavaLangClass()));
-    class_linker_->EnsureInitialized(soa.Self(), klass, true, true);
+    StackHandleScope<2> hs(soa.Self());
+
+    auto class_class(hs.NewHandle<mirror::Class>(mirror::Class::GetJavaLangClass()));
+    auto field_class(hs.NewHandle<mirror::Class>(mirror::Field::StaticClass()));
+
+    class_linker_->EnsureInitialized(soa.Self(), class_class, true, true);
+    // Field class is needed for register_java_net_InetAddress in libcore, b/28153851.
+    class_linker_->EnsureInitialized(soa.Self(), field_class, true, true);
   }
 
   // InitNativeMethods needs to be after started_ so that the classes