Merge "Do not allow apps to cause Bluetooth to be discoverable forever" am: 692ad7c9ec

am: 717d9f205a

Change-Id: I1c4f627f6792109db1fec087855962bf4f635b7c
This commit is contained in:
Ajay Panicker
2016-08-18 22:30:51 +00:00
committed by android-build-merger

View File

@@ -267,7 +267,7 @@ public class RequestPermissionActivity extends Activity implements
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 {