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

Commit 642ac12b authored by Satish Kodishala's avatar Satish Kodishala Committed by android-build-merger
Browse files

Merge "HFP: Reset max index if greater than number of Phone Book entries" am:... 

Merge "HFP: Reset max index if greater than number of Phone Book entries" am: ff1deb06 am: 976dd1df am: 81100044
am: 2f2c0d4c

Change-Id: Ia1724ec6c942fab8ae8552b2453b26f710cb755d
parents d465c896 2f2c0d4c

android/app/src/com/android/bluetooth/hfp/AtPhonebook.java

+8 −1
Original line number Diff line number Diff line
@@ -490,6 +490,7 @@ public class AtPhonebook { 
        // Check phonebook

        PhonebookResult pbr = getPhonebookResult(mCurrentPhonebook, true); //false);

        if (pbr == null) {

            Log.e(TAG, "pbr is null");

            atCommandErrorCode = BluetoothCmeError.OPERATION_NOT_ALLOWED;

            return atCommandResult;

        }
@@ -499,11 +500,17 @@ public class AtPhonebook { 
        // When we send error, certain kits like BMW disconnect the

        // Handsfree connection.

        if (pbr.cursor.getCount() == 0 || mCpbrIndex1 <= 0 || mCpbrIndex2 < mCpbrIndex1  ||

            mCpbrIndex2 > pbr.cursor.getCount() || mCpbrIndex1 > pbr.cursor.getCount()) {

            mCpbrIndex1 > pbr.cursor.getCount()) {

            atCommandResult = HeadsetHalConstants.AT_RESPONSE_OK;

            Log.e(TAG, "Invalid request or no results, returning");

            return atCommandResult;

        }



        if (mCpbrIndex2 > pbr.cursor.getCount()) {

            Log.w(TAG, "max index requested is greater than number of records"

                        + " available, resetting it");

            mCpbrIndex2 = pbr.cursor.getCount();

        }

        // Process

        atCommandResult = HeadsetHalConstants.AT_RESPONSE_OK;

        int errorDetected = -1; // no error