2014-05-28 07:48:13

by Jakub Tyszkowski

[permalink] [raw]
Subject: [PATCH] android/gatt: Fix not checking for read errors in read by type

---
android/gatt.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/android/gatt.c b/android/gatt.c
index 0c9837d..736c7cc 100644
--- a/android/gatt.c
+++ b/android/gatt.c
@@ -3677,9 +3677,15 @@ static void send_dev_pending_response(struct gatt_device *device,
goto done;
}

+ if (val->error) {
+ queue_destroy(temp, NULL);
+ error = val->error;
+ goto done;
+ }
+
length = val->length;

- while (val && val->length == length) {
+ while (val && val->length == length && val->error == 0) {
queue_push_tail(temp, val);
val = queue_pop_head(device->pending_requests);
}
--
1.9.3



2014-05-28 08:52:27

by Jakub Tyszkowski

[permalink] [raw]
Subject: [PATCH] android/pts: Update GATT PTS results

---
android/pts-gatt.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/pts-gatt.txt b/android/pts-gatt.txt
index b5126ee..f9667e2 100644
--- a/android/pts-gatt.txt
+++ b/android/pts-gatt.txt
@@ -149,9 +149,9 @@ TC_GAR_SR_BI_06_C PASS haltest:
gatts start_service
TC_GAR_SR_BI_07_C PASS
TC_GAR_SR_BI_08_C PASS
-TC_GAR_SR_BI_09_C INC
-TC_GAR_SR_BI_10_C INC
-TC_GAR_SR_BI_11_C INC
+TC_GAR_SR_BI_09_C PASS
+TC_GAR_SR_BI_10_C PASS
+TC_GAR_SR_BI_11_C PASS
TC_GAR_SR_BV_04_C PASS haltest:
gatts add_service
gatts add_chaaracteristic:
--
1.9.3