Backed out changeset d7b73b7ab1a5 (bug 1507947) for mochitest failures on test_expanding_selection_per_page.html.

This commit is contained in:
Brindusan Cristian 2018-12-11 02:00:55 +02:00
parent df4ad60746
commit 34343d1067

View File

@ -94,26 +94,20 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
}
Log.e(LOGTAG, "Cannot connect to process " + mType);
unbind();
context.unbindService(this);
return null;
}
public synchronized void unbind() {
try {
if (mChild != null) {
final int pid = getPid();
if (mChild != null) {
final Context context = GeckoAppShell.getApplicationContext();
context.unbindService(this);
}
final Context context = GeckoAppShell.getApplicationContext();
context.unbindService(this);
mChild = null;
if (pid != 0) {
Process.killProcess(pid);
waitForChildLocked();
}
}
} catch (Exception e) {
Log.w(LOGTAG, "Failed to unbind", e);
final int pid = getPid();
if (pid != 0) {
Process.killProcess(pid);
waitForChildLocked();
}
}