diff options
| -rw-r--r-- | core/java/android/app/LoadedApk.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java index 25e35734202e..e16ce24cbb2c 100644 --- a/core/java/android/app/LoadedApk.java +++ b/core/java/android/app/LoadedApk.java @@ -937,7 +937,9 @@ public final class LoadedApk { // // It is NOT ok to call this function from the system_server (for any of the packages it // loads code from) so we explicitly disallow it there. - if (needToSetupJitProfiles && !ActivityThread.isSystem()) { + // + // It is not ok to call this in a zygote context where mActivityThread is null. + if (needToSetupJitProfiles && !ActivityThread.isSystem() && mActivityThread != null) { setupJitProfileSupport(); } |