Ensure cache the merged resources for current application, fix wequic…

…k#429
ameryzhu · Mar 1, 2017 · 7a0e2a6 · 7a0e2a6
1 parent 9fb1c54
commit 7a0e2a6
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 4 deletions.
diff --git a/Android/DevSample/small/src/main/java/net/wequick/small/ApkBundleLauncher.java b/Android/DevSample/small/src/main/java/net/wequick/small/ApkBundleLauncher.java
@@ -216,6 +216,7 @@ public void callActivityOnCreate(Activity activity, android.os.Bundle icicle) {
  if (ai == null) break;
 
  applyActivityInfo(activity, ai);
+ ReflectAccelerator.ensureCacheResources();
  } while (false);
  sHostInstrumentation.callActivityOnCreate(activity, icicle);
 

diff --git a/Android/DevSample/small/src/main/java/net/wequick/small/util/ReflectAccelerator.java b/Android/DevSample/small/src/main/java/net/wequick/small/util/ReflectAccelerator.java
@@ -23,13 +23,11 @@
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.res.AssetManager;
-import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.util.ArrayMap;
-import android.util.DisplayMetrics;
 
 import java.io.File;
 import java.io.IOException;
@@ -41,7 +39,7 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+import java.util.Set;
 import java.util.zip.ZipFile;
 
 import dalvik.system.DexClassLoader;
@@ -58,6 +56,9 @@ public class ReflectAccelerator {
  private static Field sActivityClientRecord_intent_field;
  private static Field sActivityClientRecord_activityInfo_field;
 
+ private static ArrayMap<Object, WeakReference<Object>> sResourceImpls;
+ private static Object/*ResourcesImpl*/ sMergedResourcesImpl;
+
  private ReflectAccelerator() { /** cannot be instantiated */ }
 
  private static final class V9_13 {
@@ -424,6 +425,12 @@ public static void mergeResources(Application app, Object activityThread, String
 
  references = (Collection) mResourceReferences.get(resourcesManager);
  }
+
+ if (Build.VERSION.SDK_INT >= 24) {
+ Field fMResourceImpls = resourcesManagerClass.getDeclaredField("mResourceImpls");
+ fMResourceImpls.setAccessible(true);
+ sResourceImpls = (ArrayMap)fMResourceImpls.get(resourcesManager);
+ }
  } else {
  Field fMActiveResources = activityThread.getClass().getDeclaredField("mActiveResources");
  fMActiveResources.setAccessible(true);
@@ -445,15 +452,21 @@ public static void mergeResources(Application app, Object activityThread, String
  Field mResourcesImpl = Resources.class.getDeclaredField("mResourcesImpl");
  mResourcesImpl.setAccessible(true);
  Object resourceImpl = mResourcesImpl.get(resources);
- //check if rom change resourceImpl may be a subclass of resourceImpl like miui8
  Field implAssets;
  try {
  implAssets = resourceImpl.getClass().getDeclaredField("mAssets");
  } catch (NoSuchFieldException e) {
+ // Compat for MiUI 8+
  implAssets = resourceImpl.getClass().getSuperclass().getDeclaredField("mAssets");
  }
  implAssets.setAccessible(true);
  implAssets.set(resourceImpl, newAssetManager);
+
+ if (Build.VERSION.SDK_INT >= 24) {
+ if (resources == app.getResources()) {
+ sMergedResourcesImpl = resourceImpl;
+ }
+ }
  }
 
  resources.updateConfiguration(resources.getConfiguration(), resources.getDisplayMetrics());
@@ -479,6 +492,24 @@ public static void mergeResources(Application app, Object activityThread, String
  }
  }
 
+ public static void ensureCacheResources() {
+ if (Build.VERSION.SDK_INT < 24) return;
+ if (sResourceImpls == null || sMergedResourcesImpl == null) return;
+
+ Set<?> resourceKeys = sResourceImpls.keySet();
+ for (Object resourceKey : resourceKeys) {
+ WeakReference resourceImpl = (WeakReference)sResourceImpls.get(resourceKey);
+ if (resourceImpl != null && resourceImpl.get() == null) {
+ // Sometimes? the weak reference for the key was released by what
+ // we can not find the cache resources we had merged before.
+ // And the system will recreate a new one which only build with host resources.
+ // So we needs to restore the cache. Fix #429.
+ // FIXME: we'd better to find the way to KEEP the weak reference.
+ sResourceImpls.put(resourceKey, new WeakReference<Object>(sMergedResourcesImpl));
+ }
+ }
+ }
+
  public static Object getActivityThread(Context context) {
  try {
  Class activityThread = Class.forName("android.app.ActivityThread");