commit 3c1149871d91b0b472a70b336e0c964b0f54c09c
author Ajay Panicker <apanicke@google.com> Thu Aug 18 13:17:19 2016 -0700
committer Ajay Panicker <apanicke@google.com> Thu Aug 18 13:28:27 2016 -0700
tree 1511fc1388315b9e7de6ed913511ffe149ffc509
parent 682c2ede0970b6bfce302997a8f6678b3639dc46

Do not allow apps to cause Bluetooth to be discoverable forever

Trying to set a discoverable timout of 0 for Bluetooth will now
not allow bluetooth to be discoverable forever.

Bug: 28177801
Change-Id: Icfa03e2100f8e7f31415ebab39889b9ec32e6c77
(cherry picked from commit 6dcab67c0ccf5d9a644059260a16f46a07043eee)

src/com/android/settings/bluetooth/RequestPermissionActivity.java

diff --git a/src/com/android/settings/bluetooth/RequestPermissionActivity.java b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
index 9ce332d..3148aed 100644
--- a/src/com/android/settings/bluetooth/RequestPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
@@ -267,7 +267,7 @@
 
             Log.d(TAG, "Setting Bluetooth Discoverable Timeout = " + mTimeout);
 
-            if (mTimeout < 0 || mTimeout > MAX_DISCOVERABLE_TIMEOUT) {
+            if (mTimeout < 1 || mTimeout > MAX_DISCOVERABLE_TIMEOUT) {
                 mTimeout = BluetoothDiscoverableEnabler.DEFAULT_DISCOVERABLE_TIMEOUT;
             }
         } else {