diff options
| author | Michael Wright <michaelwr@google.com> | 2015-10-20 17:06:27 +0100 |
|---|---|---|
| committer | Michael Wright <michaelwr@google.com> | 2015-10-20 17:06:27 +0100 |
| commit | bab2b424453e556a2e7bb9470d70673793dd82df (patch) | |
| tree | c326aacd8863c8cf6708955b76f278afbd235f07 /packages/SettingsLib | |
| parent | 6320767fb181f48ea40da7da84167dbff373ea10 (diff) | |
| parent | 57a5cba606e5d58cc4ad1c5c1cf4918dc16fe819 (diff) | |
| download | frameworks_base-bab2b424453e556a2e7bb9470d70673793dd82df.zip frameworks_base-bab2b424453e556a2e7bb9470d70673793dd82df.tar.gz frameworks_base-bab2b424453e556a2e7bb9470d70673793dd82df.tar.bz2 | |
resolve merge conflicts of 57a5cba606 to cw-e-dev.
Change-Id: Ib43f0cf0b285c9799239658859af735279f87fff
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(); } |