summaryrefslogtreecommitdiffstats
path: root/packages/SettingsLib
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2015-10-20 15:31:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-10-20 15:31:01 +0000
commit57a5cba606e5d58cc4ad1c5c1cf4918dc16fe819 (patch)
tree9b0a8e5225992b4272d3a572a1e1f3a8d74d808d /packages/SettingsLib
parentad968cf4e55afdd897ea84a44b7450442aea1e1d (diff)
parent9209c9cd9a6f779d0d9d86f9b2e368df564fa6bb (diff)
downloadframeworks_base-57a5cba606e5d58cc4ad1c5c1cf4918dc16fe819.zip
frameworks_base-57a5cba606e5d58cc4ad1c5c1cf4918dc16fe819.tar.gz
frameworks_base-57a5cba606e5d58cc4ad1c5c1cf4918dc16fe819.tar.bz2
Merge "Add SystemUI component to watch for keyboard attachment." into mnc-dr-dev
Diffstat (limited to 'packages/SettingsLib')
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothAdapter.java5
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();
}