commit 2f1256d4b337123c8b040d8f11c81a14f62b56ac
author Wei Wang <weiwa@google.com> Wed May 07 15:05:14 2014 -0700
committer Wei Wang <weiwa@google.com> Wed May 07 15:05:14 2014 -0700
tree d5635635450f690b35b86a884f7f92b26cc44512
parent 1af30dddcc7a034f9631dda949aa5272d5072f08

Changes due to the rename of isShortUuid to is16BitUuid.

Change-Id: I6a822ebcbe55d1e3162c3f3374278bf7f0adea5f

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

diff --git a/android/app/src/com/android/bluetooth/gatt/GattService.java b/android/app/src/com/android/bluetooth/gatt/GattService.java
index 50f9ec0..7e1b0b5 100644
--- a/android/app/src/com/android/bluetooth/gatt/GattService.java
+++ b/android/app/src/com/android/bluetooth/gatt/GattService.java
@@ -1169,7 +1169,7 @@
         for (HandleMap.Entry entry : mHandleMap.mEntries) {
             if (entry.advertisePreferred) {
                 ParcelUuid parcelUuid = new ParcelUuid(entry.uuid);
-                if (BluetoothUuid.isShortUuid(parcelUuid)) {
+                if (BluetoothUuid.is16BitUuid(parcelUuid)) {
                     serviceUuids.add(parcelUuid);
                 } else {
                     // Allow at most one 128 bit service uuid to be advertised.
@@ -1791,7 +1791,7 @@
         int availableSize = ADVERTISING_PACKET_MAX_BYTES - ADVERTISING_FLAGS_BYTES;
 
         for (ParcelUuid parcelUuid : getAdvServiceUuids()) {
-            if (BluetoothUuid.isShortUuid(parcelUuid)) {
+            if (BluetoothUuid.is16BitUuid(parcelUuid)) {
                 availableSize -= FIELD_OVERHEAD_BYTES + SHORT_UUID_BYTES;
             } else {
                 availableSize -= FIELD_OVERHEAD_BYTES + FULL_UUID_BYTES;