commit 610e49f5adc8b5e4a37696aa20fc029dab6b1e40
author Brian Carlstrom <bdc@google.com> Mon Nov 04 17:07:22 2013 -0800
committer Brian Carlstrom <bdc@google.com> Mon Nov 04 17:21:38 2013 -0800
tree c59c82e6a00f71ee525bb657e0f3dc8ac53c5977
parent c26a56cb596c3c8efd519c4014fc2ebb3e48b221

Fix typo in duplicate condition

Bug: https://code.google.com/p/android/issues/detail?id=61768
Change-Id: I65b85de1d942c5bd0dfd6a8f7b67e157c066b9f6

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index ac8a87c..184e5d4 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -2945,7 +2945,7 @@
 static bool CanWeInitializeClass(mirror::Class* klass, bool can_init_statics,
                                  bool can_init_parents)
     SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) {
-  if (can_init_statics && can_init_statics) {
+  if (can_init_statics && can_init_parents) {
     return true;
   }
   if (!can_init_statics) {
@@ -2969,7 +2969,7 @@
     if (!can_init_parents && !super_class->IsInitialized()) {
       return false;
     } else {
-      if (!CanWeInitializeClass(super_class, can_init_statics, true)) {
+      if (!CanWeInitializeClass(super_class, can_init_statics, can_init_parents)) {
         return false;
       }
     }