Merge "MAP: Throw exception for illegal ID column" am: c0f57758b1 am: 8d73d47ef2 (24488e01) · Commits · e / os / android_packages_modules_Bluetooth

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

+10 −6

Original line number	Diff line number	Diff line
		@@ -1410,7 +1410,11 @@ public class BluetoothMapContentObserver {
		try {
		if (c != null && c.moveToFirst()) {
		do {
		long id = c.getLong(c.getColumnIndex(Sms._ID));
		int idIndex = c.getColumnIndexOrThrow(Sms._ID);
		if (c.isNull(idIndex)) {
		throw new IllegalStateException("ID is null");
		}
		long id = c.getLong(idIndex);
		int type = c.getInt(c.getColumnIndex(Sms.TYPE));
		int threadId = c.getInt(c.getColumnIndex(Sms.THREAD_ID));
		int read = c.getInt(c.getColumnIndex(Sms.READ));
		@@ -1526,8 +1530,6 @@ public class BluetoothMapContentObserver {
		}
		} while (c.moveToNext());
		}
		} catch (IllegalStateException e) {
		Log.w(TAG, e);
		} finally {
		if (c != null) {
		c.close();
		@@ -1568,7 +1570,11 @@ public class BluetoothMapContentObserver {
		try {
		if (c != null && c.moveToFirst()) {
		do {
		long id = c.getLong(c.getColumnIndex(Mms._ID));
		int idIndex = c.getColumnIndexOrThrow(Mms._ID);
		if (c.isNull(idIndex)) {
		throw new IllegalStateException("ID is null");
		}
		long id = c.getLong(idIndex);
		int type = c.getInt(c.getColumnIndex(Mms.MESSAGE_BOX));
		int mtype = c.getInt(c.getColumnIndex(Mms.MESSAGE_TYPE));
		int threadId = c.getInt(c.getColumnIndex(Mms.THREAD_ID));
		@@ -1697,8 +1703,6 @@ public class BluetoothMapContentObserver {
		} while (c.moveToNext());

		}
		} catch (IllegalStateException e) {
		Log.w(TAG, e);
		} finally {
		if (c != null) {
		c.close();