Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9738e7d3 authored by Christopher Ferris's avatar Christopher Ferris
Browse files

resolve merge conflicts of cf111230 to master 

Change-Id: I6d65685d415edea0be48bab04a71d4c52b1c66fe
parents c8108f57 cf111230

core/java/com/android/internal/os/ZygoteInit.java

+1 −1
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ public class ZygoteInit { 
            zygoteServer.closeServerSocket();

        } catch (Zygote.MethodAndArgsCaller caller) {

            caller.run();

        } catch (RuntimeException ex) {

        } catch (Throwable ex) {

            Log.e(TAG, "System zygote died with exception", ex);

            zygoteServer.closeServerSocket();

            throw ex;