am 31dc9491: am 76ad10a1: Fix crash in Bluetooth when sharing MMS video. (de0481a6) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java

+14 −3

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import android.content.ContentResolver;
		import android.content.Context;
		import android.content.res.AssetFileDescriptor;
		import android.database.Cursor;
		import android.database.sqlite.SQLiteException;
		import android.net.Uri;
		import android.provider.OpenableColumns;
		import android.util.Log;
		@@ -108,9 +109,15 @@ public class BluetoothOppSendFileInfo {
		// bluetooth
		if ("content".equals(scheme)) {
		contentType = contentResolver.getType(uri);
		Cursor metadataCursor = contentResolver.query(uri, new String[] {
		Cursor metadataCursor;
		try {
		metadataCursor = contentResolver.query(uri, new String[] {
		OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE
		}, null, null, null);
		} catch (SQLiteException e) {
		// some content providers don't support the DISPLAY_NAME or SIZE columns
		metadataCursor = null;
		}
		if (metadataCursor != null) {
		try {
		if (metadataCursor.moveToFirst()) {
		@@ -122,6 +129,10 @@ public class BluetoothOppSendFileInfo {
		metadataCursor.close();
		}
		}
		if (fileName == null) {
		// use last segment of URI if DISPLAY_NAME query fails
		fileName = uri.getLastPathSegment();
		}
		} else if ("file".equals(scheme)) {
		fileName = uri.getLastPathSegment();
		contentType = type;