Merge "MAP: Skip invalid message data" into rvc-qpr-dev (c67999b4) · Commits · e / os / android_packages_modules_Bluetooth

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));