commit 50a3e9c70694358d12afa90cf67b4c371351a8e3
author Ian Rogers <irogers@google.com> Wed May 18 19:40:49 2016 -0700
committer Pavlin Radoslavov <pavlin@google.com> Thu May 19 22:56:10 2016 +0000
tree 071e2d3d2ca34efd1320047cc6339699cf506f40
parent d827bc7300e381ee6a3241697e6013406203892c

Fix a test related to GATT client that could never succeed

Caught by Error Prone:
warning: [CollectionIncompatibleType] Argument 'clientIf' should not be
passed to this method; its type int is not compatible with its
collection's type argument AdvertiseClient.

Bug: 27723540
Change-Id: I395b17a46c3734afd0f49866b7aa0bd0f1c6cef4
(cherry picked from commit c6064ccebc5f55b49628296ce578288b3ad704e1)

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

diff --git a/src/com/android/bluetooth/gatt/AdvertiseManager.java b/src/com/android/bluetooth/gatt/AdvertiseManager.java
index 91932bb..a53eb41 100644
--- a/src/com/android/bluetooth/gatt/AdvertiseManager.java
+++ b/src/com/android/bluetooth/gatt/AdvertiseManager.java
@@ -184,7 +184,7 @@
         private void handleStartAdvertising(AdvertiseClient client) {
             Utils.enforceAdminPermission(mService);
             int clientIf = client.clientIf;
-            if (mAdvertiseClients.contains(clientIf)) {
+            if (mAdvertiseClients.contains(client)) {
                 postCallback(clientIf, AdvertiseCallback.ADVERTISE_FAILED_ALREADY_STARTED);
                 return;
             }