diff options
| author | Srikanth Uppala <suppala@broadcom.com> | 2012-04-04 03:33:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-16 21:19:35 -0700 |
| commit | b527e5f44a3a3663c6794eeae95bac1e4b94db9c (patch) | |
| tree | 11032976d9edff8d6e2c50c1dd8bb8b8dc18c44e /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | fab62db7cf9962e90bfe30b85df57b6c621b7310 (diff) | |
Fix discoverability timeout issues. (a) implement timeout logic (b) persist 'never timeout' after reboot (c) code cleanup
Change-Id: Iacaec4a48a45935a49576c140ea11ea3d0da6361
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')
| -rwxr-xr-x[-rw-r--r--] | framework/java/android/bluetooth/BluetoothAdapter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java index c4595a16c4..c822754311 100644..100755 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/java/android/bluetooth/BluetoothAdapter.java @@ -670,7 +670,8 @@ public final class BluetoothAdapter { /** @hide */ public boolean setScanMode(int mode) { if (getState() != STATE_ON) return false; - return setScanMode(mode, 120); + /* getDiscoverableTimeout() to use the latest from NV than use 0 */ + return setScanMode(mode, getDiscoverableTimeout()); } /** @hide */ |