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

Commit 3450c033 authored by Andre Eisenbach's avatar Andre Eisenbach Committed by Gerrit Code Review
Browse files

Merge "Protect against SecurityException generated by query"

parents 4f9cb029 01ed139b

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

    }