From 4e15605b5bd15691839cc87254a52bbcb4a5bd3d Mon Sep 17 00:00:00 2001
From: Claire Treyz <treyz@google.com>
Date: Thu, 26 Jul 2018 10:17:53 -0700
Subject: [PATCH] Fix unregisterScanner call in BluetoothLeScanner.

LE scanners were originally part of the GATT client, but were seperated
out and have their own registration API, so the BluetoothLeScanner call
to unregisterClient should be updated to call unregisterScanner.

Bug:75984723
Change-Id: I4c0543beb6d7b706cf75e78fcfb58480a6efd1d8
---
 core/java/android/bluetooth/le/BluetoothLeScanner.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/android/bluetooth/le/BluetoothLeScanner.java b/core/java/android/bluetooth/le/BluetoothLeScanner.java
index 347fc4df4ebbe..f5e2a09ee3e24 100644
--- a/core/java/android/bluetooth/le/BluetoothLeScanner.java
+++ b/core/java/android/bluetooth/le/BluetoothLeScanner.java
@@ -441,8 +441,8 @@ public final class BluetoothLeScanner {
                 if (status == BluetoothGatt.GATT_SUCCESS) {
                     try {
                         if (mScannerId == -1) {
-                            // Registration succeeds after timeout, unregister client.
-                            mBluetoothGatt.unregisterClient(scannerId);
+                            // Registration succeeds after timeout, unregister scanner.
+                            mBluetoothGatt.unregisterScanner(scannerId);
                         } else {
                             mScannerId = scannerId;
                             mBluetoothGatt.startScan(mScannerId, mSettings, mFilters,