Merge pull request #631 from TakayukiHoshi1984/bugfix_manager_stop

プラグインのサービスのunbindするタイミングの調整

Author: masaru-takano

dConnectManager/dConnectManager/dconnect-manager-app/src/main/java/org/deviceconnect/android/manager/DConnectLaunchActivity.java

@@ -301,7 +301,7 @@ private void displayActivity() {
 
     private boolean existsConnectedWebSocket(final DConnectService managerService) {
         WebSocketInfoManager mgr = managerService.getWebSocketInfoManager();
-        return mgr.getWebSocketInfos().size() > 0;
+        return mgr != null && mgr.getWebSocketInfos().size() > 0;
     }
 
     /**

dConnectManager/dConnectManager/dconnect-manager-core/src/main/java/org/deviceconnect/android/manager/core/plugin/BinderConnection.java

@@ -96,7 +96,11 @@ public synchronized void connect() throws ConnectingException {
     public void disconnect() {
         synchronized (this) {
             if (ConnectionState.CONNECTED == getState()) {
-                mContext.unbindService(mServiceConnection);
+                try {
+                    mContext.unbindService(mServiceConnection);
+                } catch (Exception e) {
+                    // ignore.
+                }
                 mServiceConnection = null;
                 mPlugin = null;
             }