diff options
| author | 2016-04-12 16:54:48 -0700 | |
|---|---|---|
| committer | 2016-04-12 17:59:44 -0700 | |
| commit | 6d25cf6cbda1b95fb014a3fd22c01a6bdf47725e (patch) | |
| tree | d718c92777b01053a47c14a891a6d8dd493d0821 /runtime/class_linker.h | |
| parent | 780b46126af0b4239ff5a3a88f347548d960bbe4 (diff) | |
Fix InsertDexFileInToClassLoader to handle null class loaders
Maybe used by legacy apps. This functionality is planned for
deprecation.
Bug: 27954959
(cherry picked from commit f2bf9d640e37b72be8b4f6016d4aa95a0e27b7b4)
Change-Id: I1ae2cf1e33f2f1b237a41c8cc50d2a814a52a95a
Diffstat (limited to 'runtime/class_linker.h')
| -rw-r--r-- | runtime/class_linker.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index b4b7f34967..5de502b540 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -595,6 +595,7 @@ class ClassLinker { REQUIRES(!Locks::classlinker_classes_lock_) SHARED_REQUIRES(Locks::mutator_lock_); + // May be called with null class_loader due to legacy code. b/27954959 void InsertDexFileInToClassLoader(mirror::Object* dex_file, mirror::ClassLoader* class_loader) REQUIRES(!Locks::classlinker_classes_lock_) SHARED_REQUIRES(Locks::mutator_lock_); |