From cebd677c58b36ca99a6fed9a71363fcdc4c3939d Mon Sep 17 00:00:00 2001
From: Wang Han <416810799@qq.com>
Date: Sun, 24 Oct 2021 18:09:24 +0800
Subject: [PATCH] Revert "[core] Allow vdex speedup for InMemoryDex (#1260)"

 * Useless.

This reverts commit 69900249c9d7ce21d182915982efd866455c5382.
---
 core/src/main/java/org/lsposed/lspd/core/Main.java       | 7 -------
 hiddenapi-bridge/build.gradle.kts                        | 3 +--
 .../src/main/java/hidden/HiddenApiBridge.java            | 9 ---------
 .../src/main/java/dalvik/system/VMRuntime.java           | 5 -----
 4 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/core/src/main/java/org/lsposed/lspd/core/Main.java b/core/src/main/java/org/lsposed/lspd/core/Main.java
index 0a055b70..e02aeea6 100644
--- a/core/src/main/java/org/lsposed/lspd/core/Main.java
+++ b/core/src/main/java/org/lsposed/lspd/core/Main.java
@@ -24,7 +24,6 @@ import android.app.ActivityThread;
 import android.app.LoadedApk;
 import android.content.pm.ApplicationInfo;
 import android.content.res.CompatibilityInfo;
-import android.os.Build;
 import android.os.Environment;
 import android.os.IBinder;
 import android.os.Process;
@@ -46,8 +45,6 @@ import java.io.File;
 import de.robv.android.xposed.XposedBridge;
 import de.robv.android.xposed.XposedHelpers;
 import de.robv.android.xposed.XposedInit;
-import hidden.HiddenApiBridge;
-import pxb.android.axml.Util;
 
 public class Main {
     public static void startBootstrapHook(boolean isSystem, String appDataDir) {
@@ -89,10 +86,6 @@ public class Main {
             Utils.logI("Loaded manager, skipping next steps");
             return;
         }
-        Utils.logD("appDataDir: " + appDataDir);
-        if (!isSystem && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            HiddenApiBridge.VMRuntime_setProcessDataDirectory(appDataDir);
-        }
         installBootstrapHooks(isSystem, appDataDir);
         Utils.logI("Loading modules for " + niceName + "/" + Process.myUid());
         XposedInit.loadModules();
diff --git a/hiddenapi-bridge/build.gradle.kts b/hiddenapi-bridge/build.gradle.kts
index 7943b0f2..fdd01b3c 100644
--- a/hiddenapi-bridge/build.gradle.kts
+++ b/hiddenapi-bridge/build.gradle.kts
@@ -22,6 +22,5 @@ plugins {
 }
 
 dependencies {
-    compileOnly("androidx.annotation:annotation:1.2.0")
     compileOnly(project(":hiddenapi-stubs"))
-}
+}
\ No newline at end of file
diff --git a/hiddenapi-bridge/src/main/java/hidden/HiddenApiBridge.java b/hiddenapi-bridge/src/main/java/hidden/HiddenApiBridge.java
index 2420fd7c..0941b634 100644
--- a/hiddenapi-bridge/src/main/java/hidden/HiddenApiBridge.java
+++ b/hiddenapi-bridge/src/main/java/hidden/HiddenApiBridge.java
@@ -35,12 +35,8 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.UserHandle;
 
-import androidx.annotation.RequiresApi;
-
 import java.io.File;
 
-import dalvik.system.VMRuntime;
-
 public class HiddenApiBridge {
     public static int AssetManager_addAssetPath(AssetManager am, String path) {
         return am.addAssetPath(path);
@@ -95,9 +91,4 @@ public class HiddenApiBridge {
     public static CompatibilityInfo Resources_getCompatibilityInfo(Resources res) {
         return res.getCompatibilityInfo();
     }
-
-    @RequiresApi(29)
-    public static void VMRuntime_setProcessDataDirectory(String dataDir) {
-        VMRuntime.setProcessDataDirectory(dataDir);
-    }
 }
diff --git a/hiddenapi-stubs/src/main/java/dalvik/system/VMRuntime.java b/hiddenapi-stubs/src/main/java/dalvik/system/VMRuntime.java
index da8bd1ae..2d953c32 100644
--- a/hiddenapi-stubs/src/main/java/dalvik/system/VMRuntime.java
+++ b/hiddenapi-stubs/src/main/java/dalvik/system/VMRuntime.java
@@ -1,7 +1,5 @@
 package dalvik.system;
 
-import androidx.annotation.RequiresApi;
-
 public class VMRuntime {
 
     public static VMRuntime getRuntime() {
@@ -11,7 +9,4 @@ public class VMRuntime {
     public native boolean is64Bit();
     
     public native String vmInstructionSet();
-
-    @RequiresApi(29)
-    public static native void setProcessDataDirectory(String dataDir);
 }