Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 717d9f20 authored by Ajay Panicker's avatar Ajay Panicker Committed by android-build-merger
Browse files

Merge "Do not allow apps to cause Bluetooth to be discoverable forever" 

am: 692ad7c9

Change-Id: I60f576fee6222d0917ce845dd0bc071817d26009
parents d3ad45e3 692ad7c9

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

+1 −1
Original line number Diff line number Diff line
@@ -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 {