Merge pull request #352 from TakayukiHoshi1984/bugfix_sphero_bluetoot…

…h_name_null SpheroプラグインにてBluetooth名がnullのデバイスがペアリングされている場合の不具合修正
DeviceConnect · Sep 26, 2017 · e3a0324 · e3a0324
2 parents e8a4655 + 7eb198b
commit e3a0324
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dConnectDevicePlugin/dConnectDeviceSphero/app/build.gradle b/dConnectDevicePlugin/dConnectDeviceSphero/app/build.gradle
@@ -16,7 +16,7 @@ android {
     }
     defaultConfig {
         applicationId "org.deviceconnect.android.deviceplugin.sphero"
-        minSdkVersion 14
+        minSdkVersion 18
         targetSdkVersion 23
         versionCode 1
         versionName getVersionName()

diff --git a/.../app/src/main/java/org/deviceconnect/android/deviceplugin/sphero/SpheroDeviceService.java b/.../app/src/main/java/org/deviceconnect/android/deviceplugin/sphero/SpheroDeviceService.java
@@ -144,7 +144,7 @@ public void onCreate() {
         BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
         Set<BluetoothDevice> pairedDevices = adapter.getBondedDevices();
         for (BluetoothDevice device : pairedDevices) {
-            if (device.getName().contains("Sphero")) {
+            if (device.getName() != null && device.getName().contains("Sphero")) {
                 PermissionUtility.requestPermissions(SpheroDeviceService.this, mHandler,
                         BleUtils.BLE_PERMISSIONS,
                         new PermissionUtility.PermissionRequestCallback() {