rusefi
/
Android-DFU-Library
mirror of https://github.com/rusefi/Android-DFU-Library.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into secure_dfu

This commit is contained in:
Aleksander Nowakowski 2016-08-25 16:18:41 +02:00
parent c3bac438b9 c92e9c0b51
commit 8dad65db9e
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dfu/build.gradle
View File

@ -41,7 +41,7 @@ ext {
android { android {
compileSdkVersion 24 compileSdkVersion 24
buildToolsVersion '24.0.0' buildToolsVersion '24.0.2'
defaultConfig { defaultConfig {
minSdkVersion 18 minSdkVersion 18
@ -59,7 +59,7 @@ android {
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:support-v4:24.0.0' compile 'com.android.support:support-v4:24.2.0'
compile 'com.google.code.gson:gson:2.5' compile 'com.google.code.gson:gson:2.5'
} }
/* /*

6
dfu/src/main/java/no/nordicsemi/android/dfu/DfuBaseService.java
View File

@ -908,6 +908,12 @@ public abstract class DfuBaseService extends IntentService implements DfuProgres
report(ERROR_BLUETOOTH_DISABLED); report(ERROR_BLUETOOTH_DISABLED);
return; return;
} }
if (mConnectionState == STATE_DISCONNECTED) {
loge("Device got disconnected before service discovery finished");
sendLogBroadcast(LOG_LEVEL_INFO, "Disconnected");
terminateConnection(gatt, ERROR_DEVICE_DISCONNECTED);
return;
}
if (mError > 0) { // error occurred if (mError > 0) { // error occurred
if ((mError & ERROR_CONNECTION_STATE_MASK) > 0) { if ((mError & ERROR_CONNECTION_STATE_MASK) > 0) {
final int error = mError & ~ERROR_CONNECTION_STATE_MASK; final int error = mError & ~ERROR_CONNECTION_STATE_MASK;

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Thu Jun 30 16:41:24 CEST 2016 #Thu Aug 18 10:00:25 CEST 2016
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip