resolved conflicts for merge of d2e5a693 to lmp-dev-plus-aosp

Change-Id: If834354fbf8b022487bf6d50fc08125a20726012

diff --cc runtime/verifier/method_verifier.cc
index f366000,f241281..25220a9
--- 1/runtime/verifier/method_verifier.cc
--- 2/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@@ -297,15 -297,14 +297,15 @@@ MethodVerifier::FailureKind MethodVerif
    return result;
  }
  
 -MethodVerifier* MethodVerifier::VerifyMethodAndDump(Thread* self, std::ostream& os, uint32_t dex_method_idx,
 -                                         const DexFile* dex_file,
 -                                         Handle<mirror::DexCache> dex_cache,
 -                                         Handle<mirror::ClassLoader> class_loader,
 -                                         const DexFile::ClassDef* class_def,
 -                                         const DexFile::CodeItem* code_item,
 -                                         Handle<mirror::ArtMethod> method,
 -                                         uint32_t method_access_flags) {
 +MethodVerifier* MethodVerifier::VerifyMethodAndDump(Thread* self, std::ostream& os,
 +                                                    uint32_t dex_method_idx,
 +                                                    const DexFile* dex_file,
-                                                     ConstHandle<mirror::DexCache> dex_cache,
-                                                     ConstHandle<mirror::ClassLoader> class_loader,
++                                                    Handle<mirror::DexCache> dex_cache,
++                                                    Handle<mirror::ClassLoader> class_loader,
 +                                                    const DexFile::ClassDef* class_def,
 +                                                    const DexFile::CodeItem* code_item,
-                                                     ConstHandle<mirror::ArtMethod> method,
++                                                    Handle<mirror::ArtMethod> method,
 +                                                    uint32_t method_access_flags) {
    MethodVerifier* verifier = new MethodVerifier(self, dex_file, dex_cache, class_loader,
                                                  class_def, code_item, dex_method_idx, method,
                                                  method_access_flags, true, true, true, true);

diff --cc runtime/verifier/method_verifier.h
index 692b8f4,87acb20..f1dc09c
--- 1/runtime/verifier/method_verifier.h
--- 2/runtime/verifier/method_verifier.h
+++ b/runtime/verifier/method_verifier.h
@@@ -245,12 -245,12 +245,12 @@@ class MethodVerifier 
  
   private:
    // Private constructor for dumping.
-   MethodVerifier(Thread* self, const DexFile* dex_file, ConstHandle<mirror::DexCache> dex_cache,
-                  ConstHandle<mirror::ClassLoader> class_loader, const DexFile::ClassDef* class_def,
+   MethodVerifier(Thread* self, const DexFile* dex_file, Handle<mirror::DexCache> dex_cache,
+                  Handle<mirror::ClassLoader> class_loader, const DexFile::ClassDef* class_def,
                   const DexFile::CodeItem* code_item, uint32_t method_idx,
-                  ConstHandle<mirror::ArtMethod> method,
 -                 Handle<mirror::ArtMethod> method, uint32_t access_flags,
 -                 bool can_load_classes, bool allow_soft_failures, bool need_precise_constants,
 -                 bool verify_to_dump)
++                 Handle<mirror::ArtMethod> method,
 +                 uint32_t access_flags, bool can_load_classes, bool allow_soft_failures,
 +                 bool need_precise_constants, bool verify_to_dump)
        SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
  
    // Adds the given string to the beginning of the last failure message.