From 827de2d73e9f07e1545839889eaf035aea64ea12 Mon Sep 17 00:00:00 2001
From: Srikanth Uppala <suppala@broadcom.com>
Date: Wed, 4 Apr 2012 03:33:26 -0700
Subject: [PATCH] Fix discoverability timeout issues. (a) implement timeout
 logic (b) persist 'never timeout' after reboot (c) code cleanup

Change-Id: Iacaec4a48a45935a49576c140ea11ea3d0da6361
---
 core/java/android/bluetooth/BluetoothAdapter.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 core/java/android/bluetooth/BluetoothAdapter.java

diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java
old mode 100644
new mode 100755
index c4595a16c4556..c8227543112e8
--- a/core/java/android/bluetooth/BluetoothAdapter.java
+++ b/core/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 */