Make a.a not extend AppComponentFactory

Fix #2053
This commit is contained in:
topjohnwu
2019-11-09 15:57:12 -05:00
parent 65eca31635
commit a2ddf362d8
6 changed files with 13 additions and 18 deletions

View File

@@ -11,10 +11,8 @@
<application
android:name="a.e"
android:appComponentFactory="a.a"
android:allowBackup="true"
tools:ignore="UnusedAttribute,GoogleAppIndexingWarning"
tools:replace="android:appComponentFactory">
tools:ignore="UnusedAttribute,GoogleAppIndexingWarning">
<!-- Splash -->
<activity

View File

@@ -1,11 +1,9 @@
package a;
import androidx.core.app.AppComponentFactory;
import com.topjohnwu.magisk.utils.PatchAPK;
import com.topjohnwu.signing.BootSigner;
public class a extends AppComponentFactory {
public class a {
@Deprecated
public static boolean patchAPK(String in, String out, String pkg) {

View File

@@ -50,7 +50,7 @@ fun Context.wrapJob(): Context = object : GlobalResContext(this) {
fun Class<*>.cmp(pkg: String): ComponentName {
val name = ClassMap[this].name
return ComponentName(pkg, Info.stub?.componentMap?.get(name) ?: name)
return ComponentName(pkg, Info.stub?.classToComponent?.get(name) ?: name)
}
inline fun <reified T> Context.intent() = Intent().setComponent(T::class.java.cmp(packageName))
@@ -131,7 +131,7 @@ private class JobSchedulerWrapper(private val base: JobScheduler) : JobScheduler
val name = service.className
val component = ComponentName(
service.packageName,
Info.stub!!.componentMap[name] ?: name)
Info.stub!!.classToComponent[name] ?: name)
// Clone the JobInfo except component
val builder = JobInfo.Builder(id, component)