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

Commit 0d87b0c3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "MAP: Skip invalid message data" am: 82e89718 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65701a4239fa38730e06682a9ba72a50b2acd044
parents 82ba1b0b 82e89718

android/app/src/com/android/bluetooth/map/BluetoothMapContentObserver.java

+4 −2
Original line number Diff line number Diff line
@@ -1412,7 +1412,8 @@ public class BluetoothMapContentObserver { 
                    do {

                        int idIndex = c.getColumnIndexOrThrow(Sms._ID);

                        if (c.isNull(idIndex)) {

                            throw new IllegalStateException("ID is null");

                            Log.w(TAG, "handleMsgListChangesSms, ID is null");

                            continue;

                        }

                        long id = c.getLong(idIndex);

                        int type = c.getInt(c.getColumnIndex(Sms.TYPE));
@@ -1572,7 +1573,8 @@ public class BluetoothMapContentObserver { 
                    do {

                        int idIndex = c.getColumnIndexOrThrow(Mms._ID);

                        if (c.isNull(idIndex)) {

                            throw new IllegalStateException("ID is null");

                            Log.w(TAG, "handleMsgListChangesMms, ID is null");

                            continue;

                        }

                        long id = c.getLong(idIndex);

                        int type = c.getInt(c.getColumnIndex(Mms.MESSAGE_BOX));