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

Commit 3121a1fb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "PBAP: Check column value isn't null when query contacts" am: 11f53a71... 

Merge "PBAP: Check column value isn't null when query contacts" am: 11f53a71 am: 3ee4fb4e am: 217df023

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1322141

Change-Id: If2c59e775d8d1f889196419441c1e0fc86840f41
parents b32f30e3 217df023

android/app/src/com/android/bluetooth/pbap/BluetoothPbapUtils.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -429,7 +429,12 @@ class BluetoothPbapUtils { 
        int indexData = c.getColumnIndex(Data.DATA1);

        int indexData = c.getColumnIndex(Data.DATA1);

        int indexMimeType = c.getColumnIndex(Data.MIMETYPE);

        int indexMimeType = c.getColumnIndex(Data.MIMETYPE);

        String contactId, data, mimeType;

        String contactId, data, mimeType;



        while (c.moveToNext()) {

        while (c.moveToNext()) {

            if (c.isNull(indexCId)) {

                Log.w(TAG, "_id column is null. Row was deleted during iteration, skipping");

                continue;

            }

            contactId = c.getString(indexCId);

            contactId = c.getString(indexCId);

            data = c.getString(indexData);

            data = c.getString(indexData);

            mimeType = c.getString(indexMimeType);

            mimeType = c.getString(indexMimeType);