Revert "Revert "APIs for BLE scan, scan filter, batch scan, onFound/onLost and multiple advertising.""

This reverts commit b1d9fbc0f8dea0c77ed810190b325bfdaaf21789.

Change-Id: Ic8dec9385a7c763170ebeb1bcddd221c72f46e88

1 files changed, 32 insertions, 0 deletions

diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java
index e79deeccbd..9e1c995bbb 100644
--- a/framework/java/android/bluetooth/BluetoothAdapter.java
+++ b/framework/java/android/bluetooth/BluetoothAdapter.java
@@ -498,6 +498,34 @@ public final class BluetoothAdapter {
     }
 
     /**
+     * Returns a {@link BluetoothLeAdvertiser} object for Bluetooth LE Advertising operations.
+     */
+    public BluetoothLeAdvertiser getBluetoothLeAdvertiser() {
+        // TODO: Return null if this feature is not supported by hardware.
+        try {
+            IBluetoothGatt iGatt = mManagerService.getBluetoothGatt();
+            return new BluetoothLeAdvertiser(iGatt);
+        } catch (RemoteException e) {
+            Log.e(TAG, "failed to get BluetoothLeAdvertiser, error: " + e);
+            return null;
+        }
+    }
+
+    /**
+     * Returns a {@link BluetoothLeScanner} object for Bluetooth LE scan operations.
+     */
+    public BluetoothLeScanner getBluetoothLeScanner() {
+        // TODO: Return null if BLE scan is not supported by hardware.
+        try {
+            IBluetoothGatt iGatt = mManagerService.getBluetoothGatt();
+            return new BluetoothLeScanner(iGatt);
+        } catch (RemoteException e) {
+            Log.e(TAG, "failed to get BluetoothLeScanner, error: " + e);
+            return null;
+        }
+    }
+
+    /**
      * Interface for BLE advertising callback.
      *
      * @hide
@@ -2024,6 +2052,10 @@ public final class BluetoothAdapter {
             }
         }
 
+        @Override
+        public void onMultiAdvertiseCallback(int status) {
+            // no op
+        }
         /**
          * Callback reporting LE ATT MTU.
          * @hide