Skip to content

Commit 3769176

Browse files
Merge pull request #503 from TakayukiHoshi1984/modify_uvc_service_destroy
UVCプラグインのonDestroy時の挙動修正
2 parents 6508488 + 5b5e298 commit 3769176

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

  • dConnectDevicePlugin/dConnectDeviceUVC/app/src/main/java/org/deviceconnect/android/deviceplugin/uvc

dConnectDevicePlugin/dConnectDeviceUVC/app/src/main/java/org/deviceconnect/android/deviceplugin/uvc/UVCDeviceService.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,11 @@ public void onDestroy() {
7878
((UVCService) service).closeUVCDevice();
7979
}
8080
}
81-
mDeviceMgr.removeDeviceListener(mDeviceListener);
82-
mDeviceMgr.removeConnectionListener(mConnectionListener);
83-
mDeviceMgr.stop();
81+
if (mDeviceMgr != null) {
82+
mDeviceMgr.removeDeviceListener(mDeviceListener);
83+
mDeviceMgr.removeConnectionListener(mConnectionListener);
84+
mDeviceMgr.stop();
85+
}
8486
unregisterReceiver(mPermissionReceiver);
8587
super.onDestroy();
8688
}

0 commit comments

Comments
 (0)