修复android12主进程调用插件定义的contentprovider时ANR问题

Author: limpoxe

FairyPlugin/src/main/java/com/limpoxe/fairy/core/android/HackContentProviderHolder.java

@@ -13,6 +13,8 @@ public class HackContentProviderHolder {
  private static final String ClassName = "android.app.IActivityManager$ContentProviderHolder";
  private static final String ClassName8 = "android.app.ContentProviderHolder";
 
+ private static final String Field_mLocal = "mLocal";
+
  private Object instance;
 
  public HackContentProviderHolder(Object instance) {
@@ -27,4 +29,9 @@ public static Object newInstance(ProviderInfo info) {
  }
  }
 
+ public void setLocal(boolean local) {
+ if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) {
+ RefInvoker.setField(instance, ClassName8, Field_mLocal, local);
+ }
+ }
 }

FairyPlugin/src/main/java/com/limpoxe/fairy/core/proxy/systemservice/AndroidAppIActivityManager.java

@@ -249,7 +249,7 @@ private void tryWakeupBeforeCallPluginProvider(final String auth) {
  if (!isrunning) {
  LogUtil.d("getContentProvider", "not running, wakeup", pluginDescriptor.getPackageName());
  PluginManagerHelper.wakeup(pluginDescriptor.getPackageName());
- //TODO 这里时许仍然晚了一步 可能是因为wakeup异步执行的原因
+ //TODO 这里时序仍然晚了一步 可能是因为wakeup异步执行的原因
  }
  break;
  }
@@ -337,7 +337,7 @@ private Object tryInstallProxyForCallerProcess(final Object invokeResult, final
  providerInfo.name = ProviderClientUnsafeProxy.class.getName();
  providerInfo.packageName = FairyGlobal.getHostApplication().getPackageName();
  Object holder = HackContentProviderHolder.newInstance(providerInfo);
-
+ new HackContentProviderHolder(holder).setLocal(true);
  if (holder != null) {
  //返回代理Provider
  return holder;
@@ -405,6 +405,7 @@ private Object tryReInstallPluginContentProvider(final Object invokeResult, fina
  LogUtil.w("providerInfo packageName ", pluginDescriptor.getPackageName(), providerInfo.packageName, auth);
 
  Object holder = HackContentProviderHolder.newInstance(providerInfo);
+ new HackContentProviderHolder(holder).setLocal(true);
  if (holder != null) {
  return holder;
  } else {