commit 02634fce73ba6c373cf8511f9c2a23770aa450f7
author Treehugger Robot <treehugger-gerrit@google.com> Mon Mar 27 18:03:39 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 27 18:03:40 2017 +0000
tree ead7d189ac6f3ec1642b367a0eeda753558c4c39
parent ffca06958ce659c0da735cc0f9b50690af3bf194
parent 150d57466e21f2802d588ff6e8fab974fb91bfbf

Merge "Fix (again) bad scan record data length"

src/com/android/bluetooth/gatt/GattService.java

diff --git a/src/com/android/bluetooth/gatt/GattService.java b/src/com/android/bluetooth/gatt/GattService.java
index b1b4f77..8a07143 100644
--- a/src/com/android/bluetooth/gatt/GattService.java
+++ b/src/com/android/bluetooth/gatt/GattService.java
@@ -688,8 +688,14 @@
             ScanSettings settings = client.settings;
             byte[] scan_record_data;
             // This is for compability with applications that assume fixed size scan data.
-            if (settings.getLegacy() && ((event_type & ET_LEGACY_MASK) == 0)) {
-                scan_record_data = legacy_adv_data;
+            if (settings.getLegacy()) {
+                if ((event_type & ET_LEGACY_MASK) == 0) {
+                    // If this is legacy scan, but nonlegacy result - skip.
+                    continue;
+                } else {
+                    // Some apps are used to fixed-size advertise data.
+                    scan_record_data = legacy_adv_data;
+                }
             } else {
                 scan_record_data = adv_data;
             }
@@ -708,11 +714,6 @@
                 continue;
             }
 
-            // if this is legacy scan, return only legacy scan results
-            if (settings.getLegacy() && ((event_type & ET_LEGACY_MASK) == 0)) {
-                continue;
-            }
-
             try {
                 app.appScanStats.addResult();
                 app.callback.onScanResult(result);