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

Commit 5f1bf69f authored by Zach Johnson's avatar Zach Johnson
Browse files

Simplify getPhonebookAccessPermission 

Bug: 145171640
Test: compile & run
Change-Id: If77df5786bd5a5a9b34a4fd151005f11807e33ca
parent c783a38f

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

+9 −11
Original line number Diff line number Diff line
@@ -1716,7 +1716,15 @@ public class AdapterService extends Service { 


            enforceBluetoothPermission(service);



            return service.getPhonebookAccessPermission(device);

            SharedPreferences prefs = service.getSharedPreferences(

                    PHONEBOOK_ACCESS_PERMISSION_PREFERENCE_FILE,

                    Context.MODE_PRIVATE);

            if (!prefs.contains(device.getAddress())) {

                return BluetoothDevice.ACCESS_UNKNOWN;

            }

            return prefs.getBoolean(device.getAddress(), false)

                    ? BluetoothDevice.ACCESS_ALLOWED

                    : BluetoothDevice.ACCESS_REJECTED;

        }



        @Override
@@ -2581,16 +2589,6 @@ public class AdapterService extends Service { 
                accepted ? 0 : BluetoothDevice.UNBOND_REASON_AUTH_REJECTED);

    }



    int getPhonebookAccessPermission(BluetoothDevice device) {

        SharedPreferences pref = getSharedPreferences(PHONEBOOK_ACCESS_PERMISSION_PREFERENCE_FILE,

                Context.MODE_PRIVATE);

        if (!pref.contains(device.getAddress())) {

            return BluetoothDevice.ACCESS_UNKNOWN;

        }

        return pref.getBoolean(device.getAddress(), false) ? BluetoothDevice.ACCESS_ALLOWED

                : BluetoothDevice.ACCESS_REJECTED;

    }



    boolean setSilenceMode(BluetoothDevice device, boolean silence) {

        mSilenceDeviceManager.setSilenceMode(device, silence);

        return true;