diff options
| author | Michael Wright <michaelwr@google.com> | 2015-10-20 17:23:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-20 17:23:23 +0000 |
| commit | b959ce872c37e5f49c8f77ad188fcb9970dcce7a (patch) | |
| tree | 5407f1eefa5185fce3f672467ddb202c6bf81aeb /packages/SettingsLib | |
| parent | 02940eb47fc1bdb3b069e42190bf8a70a9b916bf (diff) | |
| parent | bab2b424453e556a2e7bb9470d70673793dd82df (diff) | |
| download | frameworks_base-b959ce872c37e5f49c8f77ad188fcb9970dcce7a.zip frameworks_base-b959ce872c37e5f49c8f77ad188fcb9970dcce7a.tar.gz frameworks_base-b959ce872c37e5f49c8f77ad188fcb9970dcce7a.tar.bz2 | |
resolve merge conflicts of 57a5cba606 to cw-e-dev.
am: bab2b42445
* commit 'bab2b424453e556a2e7bb9470d70673793dd82df':
Add SystemUI component to watch for keyboard attachment.
Diffstat (limited to 'packages/SettingsLib')
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothAdapter.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothAdapter.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothAdapter.java index 0380e21..f935f31 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothAdapter.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothAdapter.java @@ -19,6 +19,7 @@ package com.android.settingslib.bluetooth; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; +import android.bluetooth.le.BluetoothLeScanner; import android.content.Context; import android.os.ParcelUuid; import android.util.Log; @@ -106,6 +107,10 @@ public final class LocalBluetoothAdapter { return mAdapter.getScanMode(); } + public BluetoothLeScanner getBluetoothLeScanner() { + return mAdapter.getBluetoothLeScanner(); + } + public int getState() { return mAdapter.getState(); } |