Skip to content

Commit 750cfd0

Browse files
Merge pull request #482 from TakayukiHoshi1984/bugfix_deviceplugin_search
ライブラリ周りの更新
2 parents 25ba6b3 + 08c6688 commit 750cfd0

3 files changed

Lines changed: 6 additions & 12 deletions

File tree

dConnectDevicePlugin/dConnectDeviceAndroidWear/wear-app/build.gradle

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,4 @@ dependencies {
4747
compileOnly 'com.google.android.wearable:wearable:2.5.0'
4848

4949
implementation 'com.google.android.gms:play-services-wearable:17.0.0'
50-
}
51-
configurations.all {
52-
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
53-
def requested = details.requested
54-
if (requested.group == 'com.android.support') {
55-
if (!requested.name.startsWith("multidex")) {
56-
details.useVersion '27.1.1'
57-
}
58-
}
59-
}
6050
}

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)