Revert to addb9a82a6b8 (undo my failed backouts)

This commit is contained in:
Matt Brubeck
2011-11-09 17:31:09 -08:00
parent b490c0f6cf
commit 5a047d91be
6 changed files with 22 additions and 27 deletions

View File

@@ -116,7 +116,6 @@ public class GeckoAppShell
// Initialization methods
public static native void nativeInit();
public static native void nativeRun(String args);
public static native void nativeQuit();
// helper methods
public static native void setSurfaceView(GeckoSurfaceView sv);
@@ -706,7 +705,14 @@ public class GeckoAppShell
Log.i("GeckoAppJava", "we're done, good bye");
GeckoApp.mAppContext.finish();
}
System.exit(0);
getHandler().postDelayed(new Runnable() {
// This is just a watch dog to make sure we die
// we should never hit this
public void run() {
Log.w("GeckoAppShell", "Killing via System.exit()");
System.exit(0);
}
}, 5000);
}
static void scheduleRestart() {
Log.i("GeckoAppJava", "scheduling restart");