summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Bo Liu <boliu@google.com> 2019-04-05 14:54:52 -0400
committer Bo Liu <boliu@google.com> 2019-04-05 14:58:03 -0400
commit6c504aebe85ca9fc09b7c8900d61844b5dabe84d (patch)
treea133f7940d062a3dcc07fae65d4f9017e38fa150
parentce3cd94e449a85b2547a823642cb692e74bc48dd (diff)
Do not start jit profile in app zygote
Bug: 130031692 Test: Scenario in bug works. Change-Id: Ia28e8fc60cdf4afd2215b9f2239ca215694fc76c
-rw-r--r--core/java/android/app/LoadedApk.java4
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();
}