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

Commit 7c79c345 authored by Zach Johnson's avatar Zach Johnson
Browse files

Simplify handling discoverable timeout 

Bug: 145171640
Test: compile & run
Change-Id: I896d25aa593b2c173c2a096bb8e1e81b00d1bb88
parent 08868b25

src/com/android/bluetooth/btservice/AdapterService.java

+2 −10
Original line number Diff line number Diff line
@@ -1284,7 +1284,7 @@ public class AdapterService extends Service { 


            enforceBluetoothPermission(service);



            return service.getDiscoverableTimeout();

            return service.mAdapterProperties.getDiscoverableTimeout();

        }



        @Override
@@ -1296,7 +1296,7 @@ public class AdapterService extends Service { 


            enforceBluetoothPermission(service);



            return service.setDiscoverableTimeout(timeout);

            return service.mAdapterProperties.setDiscoverableTimeout(timeout);

        }



        @Override
@@ -1943,14 +1943,6 @@ public class AdapterService extends Service { 
        return true;

    }



    int getDiscoverableTimeout() {

        return mAdapterProperties.getDiscoverableTimeout();

    }



    boolean setDiscoverableTimeout(int timeout) {

        return mAdapterProperties.setDiscoverableTimeout(timeout);

    }



    ArrayList<DiscoveringPackage> getDiscoveringPackages() {

        return mDiscoveringPackages;

    }