mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-22 01:35:35 +00:00
Backed out changeset d7b73b7ab1a5 (bug 1507947) for mochitest failures on test_expanding_selection_per_page.html.
This commit is contained in:
parent
df4ad60746
commit
34343d1067
@ -94,26 +94,20 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Log.e(LOGTAG, "Cannot connect to process " + mType);
|
Log.e(LOGTAG, "Cannot connect to process " + mType);
|
||||||
unbind();
|
context.unbindService(this);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public synchronized void unbind() {
|
public synchronized void unbind() {
|
||||||
try {
|
if (mChild != null) {
|
||||||
if (mChild != null) {
|
final Context context = GeckoAppShell.getApplicationContext();
|
||||||
final int pid = getPid();
|
context.unbindService(this);
|
||||||
|
}
|
||||||
|
|
||||||
final Context context = GeckoAppShell.getApplicationContext();
|
final int pid = getPid();
|
||||||
context.unbindService(this);
|
if (pid != 0) {
|
||||||
mChild = null;
|
Process.killProcess(pid);
|
||||||
|
waitForChildLocked();
|
||||||
if (pid != 0) {
|
|
||||||
Process.killProcess(pid);
|
|
||||||
waitForChildLocked();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (Exception e) {
|
|
||||||
Log.w(LOGTAG, "Failed to unbind", e);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user