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

Commit 783a80bc authored by hughchen's avatar hughchen
Browse files

Remove CachedBluetoothDevice.ACCESS_* 

1. Remove CachedBluetoothDevice.ACCESS_*
2. Remove getPhonebookPermissionChoice(), use BluetoothDevice.getPhonebookAccessPermission() directly.
3. Remove setPhonebookPermissionChoice(), use BluetoothDevice.setPhonebookAccessPermission() directly.
4. Remove getMessagePermissionChoice(), use BluetoothDevice.getMessageAccessPermission() directly.
5. Remove setMessagePermissionChoice(), use BluetoothDevice.setMessageAccessPermission() directly.
6. Remove getSimPermissionChoice(), use BluetoothDevice.getSimAccessPermission() directly.
7. Remove setSimPermissionChoice(), use BluetoothDevice.setSimAccessPermission() directly.

Bug: 112517004
Test: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER=CachedBluetoothDeviceTest
Change-Id: Ieb46be1273c4be309b3faa7908ccd305730c5438
parent 8df81e3e

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java

+14 −80
Original line number Diff line number Diff line
@@ -72,14 +72,6 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 


    private final Collection<Callback> mCallbacks = new ArrayList<Callback>();



    // Following constants indicate the user's choices of Phone book/message access settings

    // User hasn't made any choice or settings app has wiped out the memory

    public final static int ACCESS_UNKNOWN = 0;

    // User has accepted the connection and let Settings app remember the decision

    public final static int ACCESS_ALLOWED = 1;

    // User has rejected the connection and let Settings app remember the decision

    public final static int ACCESS_REJECTED = 2;



    // How many times user should reject the connection to make the choice persist.

    private final static int MESSAGE_REJECTION_COUNT_LIMIT_TO_PERSIST = 2;
@@ -659,9 +651,9 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
    void onBondingStateChanged(int bondState) {

        if (bondState == BluetoothDevice.BOND_NONE) {

            mProfiles.clear();

            setPhonebookPermissionChoice(ACCESS_UNKNOWN);

            setMessagePermissionChoice(ACCESS_UNKNOWN);

            setSimPermissionChoice(ACCESS_UNKNOWN);

            mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_UNKNOWN);

            mDevice.setMessageAccessPermission(BluetoothDevice.ACCESS_UNKNOWN);

            mDevice.setSimAccessPermission(BluetoothDevice.ACCESS_UNKNOWN);

            mMessageRejectionCount = 0;

            saveMessageRejectionCount();

        }
@@ -767,26 +759,6 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
        void onDeviceAttributesChanged();

    }



    public int getPhonebookPermissionChoice() {

        int permission = mDevice.getPhonebookAccessPermission();

        if (permission == BluetoothDevice.ACCESS_ALLOWED) {

            return ACCESS_ALLOWED;

        } else if (permission == BluetoothDevice.ACCESS_REJECTED) {

            return ACCESS_REJECTED;

        }

        return ACCESS_UNKNOWN;

    }



    public void setPhonebookPermissionChoice(int permissionChoice) {

        int permission = BluetoothDevice.ACCESS_UNKNOWN;

        if (permissionChoice == ACCESS_ALLOWED) {

            permission = BluetoothDevice.ACCESS_ALLOWED;

        } else if (permissionChoice == ACCESS_REJECTED) {

            permission = BluetoothDevice.ACCESS_REJECTED;

        }

        mDevice.setPhonebookAccessPermission(permission);

    }



    // Migrates data from old data store (in Settings app's shared preferences) to new (in Bluetooth

    // app's shared preferences).

    private void migratePhonebookPermissionChoice() {
@@ -797,10 +769,11 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
        }



        if (mDevice.getPhonebookAccessPermission() == BluetoothDevice.ACCESS_UNKNOWN) {

            int oldPermission = preferences.getInt(mDevice.getAddress(), ACCESS_UNKNOWN);

            if (oldPermission == ACCESS_ALLOWED) {

            int oldPermission =

                    preferences.getInt(mDevice.getAddress(), BluetoothDevice.ACCESS_UNKNOWN);

            if (oldPermission == BluetoothDevice.ACCESS_ALLOWED) {

                mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);

            } else if (oldPermission == ACCESS_REJECTED) {

            } else if (oldPermission == BluetoothDevice.ACCESS_REJECTED) {

                mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);

            }

        }
@@ -810,46 +783,6 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
        editor.commit();

    }



    public int getMessagePermissionChoice() {

        int permission = mDevice.getMessageAccessPermission();

        if (permission == BluetoothDevice.ACCESS_ALLOWED) {

            return ACCESS_ALLOWED;

        } else if (permission == BluetoothDevice.ACCESS_REJECTED) {

            return ACCESS_REJECTED;

        }

        return ACCESS_UNKNOWN;

    }



    public void setMessagePermissionChoice(int permissionChoice) {

        int permission = BluetoothDevice.ACCESS_UNKNOWN;

        if (permissionChoice == ACCESS_ALLOWED) {

            permission = BluetoothDevice.ACCESS_ALLOWED;

        } else if (permissionChoice == ACCESS_REJECTED) {

            permission = BluetoothDevice.ACCESS_REJECTED;

        }

        mDevice.setMessageAccessPermission(permission);

    }



    public int getSimPermissionChoice() {

        int permission = mDevice.getSimAccessPermission();

        if (permission == BluetoothDevice.ACCESS_ALLOWED) {

            return ACCESS_ALLOWED;

        } else if (permission == BluetoothDevice.ACCESS_REJECTED) {

            return ACCESS_REJECTED;

        }

        return ACCESS_UNKNOWN;

    }



    void setSimPermissionChoice(int permissionChoice) {

        int permission = BluetoothDevice.ACCESS_UNKNOWN;

        if (permissionChoice == ACCESS_ALLOWED) {

            permission = BluetoothDevice.ACCESS_ALLOWED;

        } else if (permissionChoice == ACCESS_REJECTED) {

            permission = BluetoothDevice.ACCESS_REJECTED;

        }

        mDevice.setSimAccessPermission(permission);

    }



    // Migrates data from old data store (in Settings app's shared preferences) to new (in Bluetooth

    // app's shared preferences).

    private void migrateMessagePermissionChoice() {
@@ -860,10 +793,11 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
        }



        if (mDevice.getMessageAccessPermission() == BluetoothDevice.ACCESS_UNKNOWN) {

            int oldPermission = preferences.getInt(mDevice.getAddress(), ACCESS_UNKNOWN);

            if (oldPermission == ACCESS_ALLOWED) {

            int oldPermission =

                    preferences.getInt(mDevice.getAddress(), BluetoothDevice.ACCESS_UNKNOWN);

            if (oldPermission == BluetoothDevice.ACCESS_ALLOWED) {

                mDevice.setMessageAccessPermission(BluetoothDevice.ACCESS_ALLOWED);

            } else if (oldPermission == ACCESS_REJECTED) {

            } else if (oldPermission == BluetoothDevice.ACCESS_REJECTED) {

                mDevice.setMessageAccessPermission(BluetoothDevice.ACCESS_REJECTED);

            }

        }
@@ -908,14 +842,14 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
        if (BluetoothUuid.containsAnyUuid(uuids, PbapServerProfile.PBAB_CLIENT_UUIDS)) {

            // The pairing dialog now warns of phone-book access for paired devices.

            // No separate prompt is displayed after pairing.

            if (getPhonebookPermissionChoice() == CachedBluetoothDevice.ACCESS_UNKNOWN) {

            if (mDevice.getPhonebookAccessPermission() == BluetoothDevice.ACCESS_UNKNOWN) {

                if (mDevice.getBluetoothClass().getDeviceClass()

                        == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE ||

                    mDevice.getBluetoothClass().getDeviceClass()

                        == BluetoothClass.Device.AUDIO_VIDEO_WEARABLE_HEADSET) {

                    setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED);

                    mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);

                } else {

                    setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_REJECTED);

                    mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);

                }

            }

        }