Skip to content

Commit 08c6688

Browse files
ManagerがON/OFF時にプラグインが強制終了する問題の修正。
1 parent 0850f24 commit 08c6688

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

dConnectDevicePlugin/dConnectDeviceHeartRate/app/src/main/java/org/deviceconnect/android/deviceplugin/heartrate/HeartRateDeviceService.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,9 @@ public void onCreate() {
146146
public void onDestroy() {
147147
super.onDestroy();
148148
unregisterBluetoothFilter();
149-
getServiceProvider().removeServiceListener(this);
149+
if (getPluginContext() != null) {
150+
getServiceProvider().removeServiceListener(this);
151+
}
150152
mHeartRateManager.removeOnHeartRateDiscoveryListener(mOnDiscoveryListener);
151153
mHeartRateManager.stop();
152154
mLogger.fine("HeartRateDeviceService end.");

dConnectDevicePlugin/dConnectDeviceSphero/app/src/main/java/org/deviceconnect/android/deviceplugin/sphero/SpheroDeviceService.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,9 @@ public void onDestroy() {
294294
super.onDestroy();
295295
unregisterBluetoothFilter();
296296
unregisterDConnectServiceFilter();
297-
getServiceProvider().removeServiceListener(this);
297+
if (getPluginContext() != null) {
298+
getServiceProvider().removeServiceListener(this);
299+
}
298300
SpheroManager.INSTANCE.shutdown();
299301
}
300302

0 commit comments

Comments
 (0)