diff options
| author | 2016-01-23 14:15:49 +0000 | |
|---|---|---|
| committer | 2016-01-23 14:15:49 +0000 | |
| commit | 1bc977cf2f8199311a97f2ba9431a184540e3e9c (patch) | |
| tree | 580a02752d8e447f6dce7cce01386c7e2a9a87f4 /runtime/mirror/object_array.h | |
| parent | f7fd970244f143b1abb956e29794c446e4d57f46 (diff) | |
Revert "Load app images"
Fails when a method is duplicated (see test 097-duplicate-method)
Bug: 22858531
This reverts commit f7fd970244f143b1abb956e29794c446e4d57f46.
Change-Id: Ib30ae5be00cc568e799290be6b3c8f29cbbe4c20
Diffstat (limited to 'runtime/mirror/object_array.h')
| -rw-r--r-- | runtime/mirror/object_array.h | 4 |
1 files changed, 1 insertions, 3 deletions
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<T>* Alloc(Thread* self, Class* object_array_class, int32_t length) SHARED_REQUIRES(Locks::mutator_lock_) REQUIRES(!Roles::uninterruptible_); - template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags, - ReadBarrierOption kReadBarrierOption = kWithReadBarrier> - 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. |