From 1bc977cf2f8199311a97f2ba9431a184540e3e9c Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Sat, 23 Jan 2016 14:15:49 +0000 Subject: Revert "Load app images" Fails when a method is duplicated (see test 097-duplicate-method) Bug: 22858531 This reverts commit f7fd970244f143b1abb956e29794c446e4d57f46. Change-Id: Ib30ae5be00cc568e799290be6b3c8f29cbbe4c20 --- runtime/mirror/object_array.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'runtime/mirror/object_array.h') diff --git a/runtime/mirror/object_array.h b/runtime/mirror/object_array.h index 1b1295cedb..b45cafd2a3 100644 --- a/runtime/mirror/object_array.h +++ b/runtime/mirror/object_array.h @@ -37,9 +37,7 @@ class MANAGED ObjectArray: public Array { static ObjectArray* Alloc(Thread* self, Class* object_array_class, int32_t length) SHARED_REQUIRES(Locks::mutator_lock_) REQUIRES(!Roles::uninterruptible_); - template - ALWAYS_INLINE T* Get(int32_t i) SHARED_REQUIRES(Locks::mutator_lock_); + T* Get(int32_t i) ALWAYS_INLINE SHARED_REQUIRES(Locks::mutator_lock_); // Returns true if the object can be stored into the array. If not, throws // an ArrayStoreException and returns false. -- cgit v1.2.3-59-g8ed1b