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

Commit 76e48bbd authored by Zach Johnson's avatar Zach Johnson
Browse files

Reorder silence mode APIs 

The pattern is generally getX, then setX,
and they were in between the get and set for
phonebook access.

Bug: 145171640
Test: compile & run
Change-Id: I53de5db209919652cdb477648a1dffe98329e290
parent 37bd1ac1

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

+19 −18
Original line number Diff line number Diff line
@@ -1708,25 +1708,18 @@ public class AdapterService extends Service { 
        }



        @Override

        public int getPhonebookAccessPermission(BluetoothDevice device) {

        public boolean getSilenceMode(BluetoothDevice device) {

            AdapterService service = getService();

            if (service == null || !callerIsSystemOrActiveUser(TAG, "getPhonebookAccessPermission")) {

                return BluetoothDevice.ACCESS_UNKNOWN;

            if (service == null || !callerIsSystemOrActiveUser(TAG, "getSilenceMode")) {

                return false;

            }



            enforceBluetoothPermission(service);

            enforceBluetoothPrivilegedPermission(service);



            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;

            return service.mSilenceDeviceManager.getSilenceMode(device);

        }





        @Override

        public boolean setSilenceMode(BluetoothDevice device, boolean silence) {

            AdapterService service = getService();
@@ -1741,15 +1734,23 @@ public class AdapterService extends Service { 
        }



        @Override

        public boolean getSilenceMode(BluetoothDevice device) {

        public int getPhonebookAccessPermission(BluetoothDevice device) {

            AdapterService service = getService();

            if (service == null || !callerIsSystemOrActiveUser(TAG, "getSilenceMode")) {

                return false;

            if (service == null || !callerIsSystemOrActiveUser(TAG, "getPhonebookAccessPermission")) {

                return BluetoothDevice.ACCESS_UNKNOWN;

            }



            enforceBluetoothPrivilegedPermission(service);

            enforceBluetoothPermission(service);



            return service.mSilenceDeviceManager.getSilenceMode(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