commit bc5a795c0d486c84913d987cad5846ded840cea6
author Mathieu Chartier <mathieuc@google.com> Mon Oct 17 15:46:31 2016 -0700
committer Mathieu Chartier <mathieuc@google.com> Mon Oct 17 16:16:50 2016 -0700
tree 90db29a97a21fa15f4cbc5ffbc1f6dd191add49c
parent 38a4223fcc0493553d9ad324a1dc145869eb663a

Move art/native to ObjPtr

Bug: 31113334

Test: test-art-host

Change-Id: I67eb89cf042c762c6dcd5eb8b008b9a28e9b3319

runtime/mirror/dex_cache.h

diff --git a/runtime/mirror/dex_cache.h b/runtime/mirror/dex_cache.h
index bbe98c2..91cf1c3 100644
--- a/runtime/mirror/dex_cache.h
+++ b/runtime/mirror/dex_cache.h
@@ -211,7 +211,7 @@
   mirror::String* GetResolvedString(uint32_t string_idx) ALWAYS_INLINE
       REQUIRES_SHARED(Locks::mutator_lock_);
 
-  void SetResolvedString(uint32_t string_idx, mirror::String* resolved) ALWAYS_INLINE
+  void SetResolvedString(uint32_t string_idx, ObjPtr<mirror::String> resolved) ALWAYS_INLINE
       REQUIRES_SHARED(Locks::mutator_lock_);
 
   // Clear a string for a string_idx, used to undo string intern transactions to make sure