Skip to content

XSharedPreferences: Fix NoSuchMethodError on Android 17 Beta 3 #626

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
JingMatrix merged 1 commit into from
Apr 3, 2026
+33 −17
Merged

XSharedPreferences: Fix NoSuchMethodError on Android 17 Beta 3 #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 0 additions & 14 deletions hiddenapi/stubs/src/main/java/com/android/internal/util/XmlUtils.java
View file
Open in desktop

This file was deleted.

36 changes: 33 additions & 3 deletions legacy/src/main/java/de/robv/android/xposed/XSharedPreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
import android.os.Environment;
import android.preference.PreferenceManager;

import com.android.internal.util.XmlUtils;

import org.lsposed.lspd.util.Utils.Log;
import org.matrix.vector.impl.core.VectorServiceClient;
import org.matrix.vector.impl.utils.VectorMetaDataReader;
Expand All @@ -18,6 +16,8 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.nio.file.AccessDeniedException;
import java.nio.file.ClosedWatchServiceException;
import java.nio.file.Path;
Expand All @@ -43,6 +43,7 @@ public final class XSharedPreferences implements SharedPreferences {
private static final String TAG = "XSharedPreferences";
private static final HashMap<WatchKey, PrefsData> sWatcherKeyInstances = new HashMap<>();
private static final Object sContent = new Object();
private static final Method sReadMapXmlMethod;
private static Thread sWatcherDaemon = null;
private static WatchService sWatcher;

Expand All @@ -55,6 +56,19 @@ public final class XSharedPreferences implements SharedPreferences {
private long mFileSize;
private WatchKey mWatchKey;

static {
Method method = null;
try {
// Find the class and method once during class initialization
Class<?> xmlUtils = Class.forName("com.android.internal.util.XmlUtils");
method = xmlUtils.getDeclaredMethod("readMapXml", InputStream.class);
method.setAccessible(true);
} catch (Exception e) {
Log.e(TAG, "Failed to find com.android.internal.util.XmlUtils.readMapXml", e);
}
sReadMapXmlMethod = method;
}

private static void initWatcherDaemon() {
sWatcherDaemon = new Thread() {
@Override
Expand Down Expand Up @@ -304,6 +318,22 @@ public void run() {
}.start();
}

private Map<?, ?> performReadMapXml(InputStream str) throws XmlPullParserException, IOException {
try {
if (sReadMapXmlMethod == null) throw new IOException("Internal API not found");
return (Map<?, ?>) sReadMapXmlMethod.invoke(null, str);
} catch (InvocationTargetException e) {
// Unwrap and throw the real error
Throwable cause = e.getCause();
if (cause instanceof XmlPullParserException) throw (XmlPullParserException) cause;
if (cause instanceof IOException) throw (IOException) cause;
if (cause instanceof RuntimeException) throw (RuntimeException) cause;
throw new RuntimeException(cause);
} catch (IllegalAccessException e) {
throw new IOException("Access denied to internal API", e);
}
}

@SuppressWarnings({"rawtypes", "unchecked"})
private void loadFromDiskLocked() {
if (mLoaded) {
Expand All @@ -315,7 +345,7 @@ private void loadFromDiskLocked() {
try {
result = SELinuxHelper.getAppDataFileService().getFileInputStream(mFilename, mFileSize, mLastModified);
if (result.stream != null) {
map = XmlUtils.readMapXml(result.stream);
map = performReadMapXml(result.stream);
result.stream.close();
} else {
// The file is unchanged, keep the current values
Expand Down
Loading