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

Commit 01ed139b authored by Ajay Panicker's avatar Ajay Panicker
Browse files

Protect against SecurityException generated by query 

Bug: 30444661
Change-Id: I1d93645f1d4475cf603cda8bb28df0b960ccb445
parent 4f9cb029

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

+4 −0
Original line number Diff line number Diff line
@@ -117,7 +117,11 @@ public class BluetoothOppSendFileInfo { 
            } catch (SQLiteException e) {

                // some content providers don't support the DISPLAY_NAME or SIZE columns

                metadataCursor = null;

            } catch (SecurityException e) {

                Log.e(TAG, "generateFileInfo: Permission error, could not access URI: " + uri);

                return SEND_FILE_INFO_ERROR;

            }



            if (metadataCursor != null) {

                try {

                    if (metadataCursor.moveToFirst()) {

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

+3 −0
Original line number Diff line number Diff line
@@ -326,6 +326,9 @@ public class BluetoothOppUtility { 


    static void putSendFileInfo(Uri uri, BluetoothOppSendFileInfo sendFileInfo) {

        if (D) Log.d(TAG, "putSendFileInfo: uri=" + uri + " sendFileInfo=" + sendFileInfo);

        if (sendFileInfo == BluetoothOppSendFileInfo.SEND_FILE_INFO_ERROR) {

            Log.e(TAG, "putSendFileInfo: bad sendFileInfo, URI: " + uri);

        }

        sSendFileMap.put(uri, sendFileInfo);

    }