Skip to content

Fix Missing DynamiteApplicationContext after GmsCore package rename #290

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

Open
zappybiby wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −1
Open

Fix Missing DynamiteApplicationContext after GmsCore package rename #290

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
21 changes: 20 additions & 1 deletion play-services-core/src/main/java/com/google/android/gms/chimera/DynamiteContextFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import android.os.Process;
import android.util.Log;

import com.google.android.gms.BuildConfig;
import com.google.android.gms.chimera.container.DynamiteContext;
import com.google.android.gms.chimera.container.DynamiteModuleInfo;
import com.google.android.gms.chimera.container.FilteredClassLoader;
Expand All @@ -34,6 +35,24 @@ public class DynamiteContextFactory {
// WeakHashMap cannot be used, and there is a high probability that it will be recycled, causing ClassLoader to be rebuilt
private static final Map<String, ClassLoader> sClassLoaderCache = new HashMap<>();

private static Context createGmsPackageContext(Context context) throws PackageManager.NameNotFoundException {
String[] candidates = new String[] {
BuildConfig.APPLICATION_ID,
Constants.USER_MICROG_PACKAGE_NAME,
Constants.GMS_PACKAGE_NAME
};

for (String packageName : candidates) {
try {
return context.createPackageContext(packageName, 0);
} catch (PackageManager.NameNotFoundException e) {
Log.d(TAG, "Unable to create package context for " + packageName);
}
}

throw new PackageManager.NameNotFoundException("No supported GMS package context found");
}

public static DynamiteContext createDynamiteContext(String moduleId, Context originalContext) {
if (originalContext == null) {
Log.w(TAG, "create <DynamiteContext> Original context is null");
Expand All @@ -49,7 +68,7 @@ public static DynamiteContext createDynamiteContext(String moduleId, Context ori
}
try {
DynamiteModuleInfo moduleInfo = new DynamiteModuleInfo(moduleId);
Context gmsContext = originalContext.createPackageContext(Constants.GMS_PACKAGE_NAME, 0);
Context gmsContext = createGmsPackageContext(originalContext);
Context originalAppContext = originalContext.getApplicationContext();

DynamiteContext dynamiteContext;
Expand Down