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

Commit a9144393 authored by Andre Eisenbach's avatar Andre Eisenbach Committed by android-build-merger
Browse files

Merge "Protect against SecurityException generated by query" 

am: 3450c033

Change-Id: I9e379db4c8d54a7733bba873da2cb6abc73493e6
parents 10191675 3450c033

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
@@ -330,6 +330,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);

    }