Skip to content

add offset cache #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vvb2060 merged 5 commits into from
Oct 18, 2025
Merged

add offset cache #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e14adc0
update deps
vvb2060 Oct 14, 2025
322422d
add offset cache
vvb2060 Oct 14, 2025
4ef82c3
add built-in file cache
vvb2060 Oct 17, 2025
dc33cb5
add hardcode offset test
vvb2060 Oct 17, 2025
1a53f13
fix local test
vvb2060 Oct 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .github/workflows/android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
- api-level: 36
target: aosp_atd
arch: x86_64
- api-level: 36.0-CANARY
- api-level: CANARY
target: google_apis_ps16k
arch: x86_64
steps:
Expand All @@ -116,8 +116,17 @@ jobs:
arch: ${{ matrix.arch }}
target: ${{ matrix.target }}
channel: canary
script: ./gradlew connectedCheck
script: |
./gradlew connectedCheck -Pandroid.injected.androidTest.leaveApksInstalledAfterRun=true
./gradlew connectedCheck -Pandroid.testInstrumentationRunnerArguments.load=true
force-avd-creation: false
emulator-options: -no-snapshot -read-only -no-window -gpu swiftshader_indirect -no-audio -no-boot-anim -camera-back none
disable-animations: true
cores: 4
- name: Upload outputs
if: ${{ failure() }}
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.api-level }}_${{ matrix.arch }}_outputs
path: library/build/outputs
compression-level: 9
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[versions]
[libraries]
androidx-annotation = { module = "androidx.annotation:annotation", version= "1.9.1" }
test-ext-junit = { module = "androidx.test.ext:junit", version = "1.2.1" }
test-rules = { module = "androidx.test:rules", version = "1.6.1" }
androidx-annotation = { module = "androidx.annotation:annotation", version = "1.9.1" }
test-ext-junit = { module = "androidx.test.ext:junit", version = "1.3.0" }
test-rules = { module = "androidx.test:rules", version = "1.7.0" }

[plugins]
agp-lib = { id = "com.android.library", version = "8.8.0" }
agp-lib = { id = "com.android.library", version = "8.13.0" }
lsplugin-jgit = { id = "org.lsposed.lsplugin.jgit", version = "1.1" }
lsplugin-publish = { id = "org.lsposed.lsplugin.publish", version = "1.1" }
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
8 changes: 4 additions & 4 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 10 additions & 11 deletions library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,22 @@ plugins {
}

android {
compileSdk = 35
buildToolsVersion = "35.0.1"
compileSdk = 36
buildToolsVersion = "36.1.0"
namespace = "org.lsposed.hiddenapibypass.library"

buildFeatures {
androidResources = false
buildConfig = true
}
androidResources {
enable = false
}
defaultConfig {
minSdk = 1
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
testOptions {
targetSdk = 35
targetSdk = 36
}
buildTypes {
release {
Expand Down Expand Up @@ -63,12 +65,6 @@ dependencies {
androidTestCompileOnly(projects.stub)
}

androidComponents.onVariants { variant ->
variant.instrumentation.transformClassesWith(
ClassVisitorFactory::class.java, InstrumentationScope.PROJECT
) {}
}

abstract class ClassVisitorFactory : AsmClassVisitorFactory<InstrumentationParameters.None> {
override fun createClassVisitor(
classContext: ClassContext,
Expand Down Expand Up @@ -102,7 +98,7 @@ abstract class ManifestUpdater : DefaultTask() {
fun taskAction() {
outputManifest.get().asFile.writeText(
mergedManifest.get().asFile.readText()
.replace("<uses-sdk ", "<uses-sdk android:targetSdkVersion=\"35\" ")
.replace("<uses-sdk ", "<uses-sdk android:targetSdkVersion=\"36\" ")
)
}
}
Expand All @@ -118,6 +114,9 @@ androidComponents.onVariants { variant ->
ManifestUpdater::outputManifest
)
.toTransform(SingleArtifact.MERGED_MANIFEST)
variant.instrumentation.transformClassesWith(
ClassVisitorFactory::class.java, InstrumentationScope.PROJECT
) {}
}


Expand Down
40 changes: 40 additions & 0 deletions library/src/androidTest/java/org/lsposed/hiddenapibypass/HiddenApiBypassTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package org.lsposed.hiddenapibypass;

import static org.hamcrest.core.StringContains.containsString;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertSame;
Expand All @@ -9,10 +11,13 @@
import android.content.pm.ApplicationInfo;
import android.graphics.drawable.ClipDrawable;
import android.os.Build;
import android.os.Process;

import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.SdkSuppress;
import androidx.test.platform.app.InstrumentationRegistry;

import org.junit.BeforeClass;
import org.junit.FixMethodOrder;
import org.junit.Rule;
import org.junit.Test;
Expand All @@ -39,6 +44,20 @@ public class HiddenApiBypassTest {
public HiddenApiBypassTest() throws ClassNotFoundException {
}

@BeforeClass
public static void setUp() {
var context = InstrumentationRegistry.getInstrumentation().getContext();
Helper.enableOffsetCache(context);
}

@Test
public void AAtestCachedDataLoaded() {
var loaded = Helper.getCachedOffsetData() != null;
var arguments = InstrumentationRegistry.getArguments();
var load = arguments.containsKey("load");
assertEquals(loaded, load);
}

@Test
public void AgetDeclaredMethods() {
List<Executable> methods = HiddenApiBypass.getDeclaredMethods(runtime);
Expand Down Expand Up @@ -142,4 +161,25 @@ class X {
assertTrue(Helper.checkArgsForInvokeMethod(new Class[]{Object.class, int.class, byte.class, short.class, char.class, double.class, float.class, boolean.class, long.class}, new Object[]{new X(), 1, (byte) 0, (short) 2, 'c', 1.1, 1.2f, false, 114514L}));
}

@Test
public void PtestCachedOffset() {
var context = InstrumentationRegistry.getInstrumentation().getContext();
var artVersion = Helper.getArtVersion(context);
var isOld = artVersion == -1L;
var isNew = artVersion >= 36_00_00000L;
var is64bit = Process.is64Bit();
var data = new long[10];
data[0] = 24;
data[1] = 12;
data[2] = 24;
data[3] = 48;
data[4] = 40;
data[5] = isNew ? 40 : 56;
data[6] = isOld ? is64bit ? 40 : 28 : is64bit ? 32 : 24;
data[7] = is64bit ? 8 : 4;
data[8] = 16;
data[9] = 4;
assertArrayEquals("art version " + artVersion, data, Helper.getCachedOffsetData());
}

}
78 changes: 78 additions & 0 deletions library/src/main/java/org/lsposed/hiddenapibypass/Helper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,92 @@

package org.lsposed.hiddenapibypass;

import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Build;

import androidx.annotation.RequiresApi;

import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.lang.invoke.MethodType;
import java.util.HashSet;
import java.util.Set;

@RequiresApi(Build.VERSION_CODES.P)
@SuppressWarnings("unused")
public class Helper {
static final Set<String> signaturePrefixes = new HashSet<>();

private static long[] cachedOffsetData = null;

private static File cacheFile = null;
private static long artVersion = 0L;

public static long[] getCachedOffsetData() {
return cachedOffsetData;
}

public static void setCachedOffsetData(long[] data) {
if (cachedOffsetData != null || data.length != 10) return;
cachedOffsetData = data;

if (cacheFile == null) return;
try (var fos = new FileOutputStream(cacheFile);
var oos = new ObjectOutputStream(fos)) {
oos.writeUTF(Build.FINGERPRINT);
oos.writeLong(artVersion);
oos.writeObject(cachedOffsetData);
} catch (IOException ignored) {
}
}

public static void enableOffsetCache(Context context) {
cacheFile = new File(context.getCacheDir(), "HiddenApiBypass");
artVersion = getArtVersion(context);

try (var fis = new FileInputStream(cacheFile);
var ois = new ObjectInputStream(fis)) {
var fingerprint = ois.readUTF();
if (!Build.FINGERPRINT.equals(fingerprint)) return;
var art = ois.readLong();
if (artVersion != art) return;
cachedOffsetData = (long[]) ois.readObject();
} catch (Exception ignored) {
}
}

public static long getArtVersion(Context context) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return -1L;
var pm = context.getPackageManager();
try {
var moduleInfo = pm.getModuleInfo("com.android.art", 1);
var name = moduleInfo.getPackageName();
if (name == null) return -2L;
var info = pm.getPackageInfo(name, PackageManager.MATCH_APEX);
return info.getLongVersionCode();
} catch (PackageManager.NameNotFoundException e) {
try (var file = new FileReader("/proc/self/mountinfo");
var reader = new BufferedReader(file)) {
var line = reader.lines()
.filter(s -> s.contains(" / /apex/com.android.art@"))
.findAny();
if (!line.isPresent()) return -3L;
var part = line.get().split("@", 2)[1];
var versionStr = part.split(" ", 2)[0];
return Long.parseLong(versionStr);
} catch (Exception e2) {
return -4L;
}
}
}

static boolean checkArgsForInvokeMethod(java.lang.Class<?>[] params, Object[] args) {
if (params.length != args.length) return false;
for (int i = 0; i < params.length; ++i) {
Expand Down
Loading