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

Commit 5e1ed5c7 authored by Chienyuan's avatar Chienyuan
Browse files

Remove mMessageRejectionCount and related code 

Message permission choice will always be saved, mMessageRejectionCount
and related code are no longer need.

Bug: 120291728
Test: build pass
Change-Id: I2d8ee57b5a8e5e4fb96f762f2b8d68e6d2f97722
parent 205b9ffd

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

+0 −38
Original line number Diff line number Diff line
@@ -71,15 +71,8 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 


    boolean mJustDiscovered;



    private int mMessageRejectionCount;



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



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

    private final static int MESSAGE_REJECTION_COUNT_LIMIT_TO_PERSIST = 2;



    private final static String MESSAGE_REJECTION_COUNT_PREFS_NAME = "bluetooth_message_reject";



    /**

     * Last time a bt profile auto-connect was attempted.

     * If an ACTION_UUID intent comes in within
@@ -348,7 +341,6 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
        fetchActiveDevices();

        migratePhonebookPermissionChoice();

        migrateMessagePermissionChoice();

        fetchMessageRejectionCount();



        dispatchAttributesChanged();

    }
@@ -642,8 +634,6 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
            mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_UNKNOWN);

            mDevice.setMessageAccessPermission(BluetoothDevice.ACCESS_UNKNOWN);

            mDevice.setSimAccessPermission(BluetoothDevice.ACCESS_UNKNOWN);

            mMessageRejectionCount = 0;

            saveMessageRejectionCount();

        }



        refresh();
@@ -797,34 +787,6 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
        editor.commit();

    }



    /**

     * @return Whether this rejection should persist.

     */

    public boolean checkAndIncreaseMessageRejectionCount() {

        if (mMessageRejectionCount < MESSAGE_REJECTION_COUNT_LIMIT_TO_PERSIST) {

            mMessageRejectionCount++;

            saveMessageRejectionCount();

        }

        return mMessageRejectionCount >= MESSAGE_REJECTION_COUNT_LIMIT_TO_PERSIST;

    }



    private void fetchMessageRejectionCount() {

        SharedPreferences preference = mContext.getSharedPreferences(

                MESSAGE_REJECTION_COUNT_PREFS_NAME, Context.MODE_PRIVATE);

        mMessageRejectionCount = preference.getInt(mDevice.getAddress(), 0);

    }



    private void saveMessageRejectionCount() {

        SharedPreferences.Editor editor = mContext.getSharedPreferences(

                MESSAGE_REJECTION_COUNT_PREFS_NAME, Context.MODE_PRIVATE).edit();

        if (mMessageRejectionCount == 0) {

            editor.remove(mDevice.getAddress());

        } else {

            editor.putInt(mDevice.getAddress(), mMessageRejectionCount);

        }

        editor.commit();

    }



    private void processPhonebookAccess() {

        if (mDevice.getBondState() != BluetoothDevice.BOND_BONDED) return;