Bug 1442250 - 4. Fix crash when child preloading fails; r=me
Fix a null pointer crash when we fail to preload a child process.
MozReview-Commit-ID: FIJopxOVAEj
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java
@@ -156,18 +156,19 @@ public final class GeckoProcessManager e
}
return connection;
}
}
public void preload(final String... types) {
for (final String type : types) {
final ChildConnection connection = getConnection(type);
- connection.bind();
- connection.getPid();
+ if (connection.bind() != null) {
+ connection.getPid();
+ }
}
}
@WrapForJNI
private static int start(final String type, final String[] args,
final int ipcFd, final int crashFd,
final int crashAnnotationFd) {
return INSTANCE.start(type, args, ipcFd, crashFd, crashAnnotationFd, /* retry */ false);