From fdc7a4d8d9fe66e6049fa8738ca2e7bc82afe5ef Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Wed, 5 May 2021 15:07:47 +0800
Subject: [PATCH] [core] Refine native api (#538)

---
 core/src/main/cpp/main/src/native_api.cpp                 | 6 +++---
 core/src/main/java/de/robv/android/xposed/XposedInit.java | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/core/src/main/cpp/main/src/native_api.cpp b/core/src/main/cpp/main/src/native_api.cpp
index a8843361..1d12b56a 100644
--- a/core/src/main/cpp/main/src/native_api.cpp
+++ b/core/src/main/cpp/main/src/native_api.cpp
@@ -25,7 +25,7 @@
 #include "native_api.h"
 #include "symbol_cache.h"
 #include <dobby.h>
-#include <vector>
+#include <list>
 #include <base/object.h>
 
 /*
@@ -44,8 +44,8 @@
  */
 
 namespace lspd {
-    std::vector<NativeOnModuleLoaded> moduleLoadedCallbacks;
-    std::vector<std::string> moduleNativeLibs;
+    std::list<NativeOnModuleLoaded> moduleLoadedCallbacks;
+    std::list<std::string> moduleNativeLibs;
     std::unique_ptr<void, std::function<void(void *)>> protected_page(
             mmap(nullptr, _page_size, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED, -1, 0),
             [](void *ptr) { munmap(ptr, _page_size); });
diff --git a/core/src/main/java/de/robv/android/xposed/XposedInit.java b/core/src/main/java/de/robv/android/xposed/XposedInit.java
index 47874cc5..7e7a8b0b 100644
--- a/core/src/main/java/de/robv/android/xposed/XposedInit.java
+++ b/core/src/main/java/de/robv/android/xposed/XposedInit.java
@@ -387,9 +387,7 @@ public final class XposedInit {
         } catch (ClassNotFoundException ignored) {
         }
 
-        boolean res = initModule(mcl, apk);
-        res = res && initNativeModule(mcl, apk);
-        return res;
+        return initNativeModule(mcl, apk) && initModule(mcl, apk);
     }
 
     public final static HashSet<String> loadedPackagesInProcess = new HashSet<>(1);