Merge "dbus: Raise SIGTERM when the connection drops."android-wear-n-preview-3android-wear-n-preview-1android-n-preview-2android-n-preview-1n-preview-2n-preview-1

am: 81bb11fbf7

* commit '81bb11fbf713adcf28aeb5c5fb3430a58fe4e6f1':
  dbus: Raise SIGTERM when the connection drops.

1 files changed, 8 insertions, 2 deletions

diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index fb529554..03622882 100644
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -22,6 +22,7 @@
  */
 
 #include <config.h>
+#include <signal.h>
 #include "dbus-shared.h"
 #include "dbus-connection.h"
 #include "dbus-list.h"
@@ -4284,8 +4285,13 @@ _dbus_connection_update_dispatch_status_and_unlock (DBusConnection    *connectio
           CONNECTION_UNLOCK (connection);            
           
           _dbus_verbose ("Exiting on Disconnected signal\n");
-          _dbus_exit (1);
-          _dbus_assert_not_reached ("Call to exit() returned");
+          if (raise (SIGTERM) != 0)
+            {
+              _dbus_verbose ("Failed to raise a SIGTERM signal. Exiting\n");
+              _dbus_exit (1);
+              _dbus_assert_not_reached ("Call to exit() returned");
+            }
+          return;
         }
     }