[tinker] Fix patched resources is not found after inflating webview o…

…n Android 15.
Tencent · Dec 3, 2024 · 59ca1e2 · 59ca1e2
1 parent d96ae92
commit 59ca1e2
Showing 1 changed file with 28 additions and 10 deletions.
diff --git a/.../tinker-android-loader/src/main/java/com/tencent/tinker/loader/TinkerResourcePatcher.java b/.../tinker-android-loader/src/main/java/com/tencent/tinker/loader/TinkerResourcePatcher.java
@@ -282,18 +282,36 @@ public static void monkeyPatchExistingResources(Context context, String external
             resources.updateConfiguration(resources.getConfiguration(), resources.getDisplayMetrics());
         }
 
-        try {
-            if (resourceImpls != null) {
-                for (WeakReference<Object> wr : resourceImpls.values()) {
-                    final Object resourceImpl = wr.get();
+        if (resourceImpls != null) {
+            try {
+                Field implAssetsField = null;
+                Field mResDirField = null;
+                for (Map.Entry<Object, WeakReference<Object>> pair : resourceImpls.entrySet()) {
+                    final Object resKey = pair.getKey();
+                    if (mResDirField == null) {
+                        mResDirField = findField(resKey.getClass(), "mResDir");
+                    }
+                    String origResDir = (String) mResDirField.get(resKey);
+                    if (!appInfo.sourceDir.equals(origResDir)) {
+                        continue;
+                    }
+
+                    if (Build.VERSION.SDK_INT >= 35) {
+                        mResDirField.set(resKey, externalResourceFile);
+                    }
+
+                    final WeakReference<Object> resValueRef = pair.getValue();
+                    final Object resourceImpl = resValueRef.get();
                     if (resourceImpl != null) {
-                        final Field implAssets = findField(resourceImpl, "mAssets");
-                        implAssets.set(resourceImpl, newAssetManager);
+                        if (implAssetsField == null) {
+                            implAssetsField = findField(resourceImpl, "mAssets");
+                        }
+                        implAssetsField.set(resourceImpl, newAssetManager);
                     }
                 }
+            } catch (Throwable thr) {
+                throw new TinkerRuntimeException("Fail to hack resourceImpls field.");
             }
-        } catch (Throwable ignored) {
-            // Ignored.
         }
 
         // Handle issues caused by WebView on Android N.
@@ -305,8 +323,8 @@ public static void monkeyPatchExistingResources(Context context, String external
                 if (publicSourceDirField != null) {
                     publicSourceDirField.set(context.getApplicationInfo(), externalResourceFile);
                 }
-            } catch (Throwable ignore) {
-                // Ignored.
+            } catch (Throwable thr) {
+                ShareTinkerLog.printErrStackTrace(TAG, thr, "fail to process publicSourceDirField field hack.");
             }
         }