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

Commit 20eb66dd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "OPP: Check uri string before parse it" am: e847fb55 am: 7e8d46f2 am: 357c8e47 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1428989

Change-Id: I366cc53a2fc3758d3a69edd56eb5c21dce382996
parents 757521c8 357c8e47

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

+4 −2
Original line number Diff line number Diff line
@@ -847,8 +847,10 @@ public class BluetoothOppService extends ProfileService implements IObexConnecti 


        info.mId = cursor.getInt(cursor.getColumnIndexOrThrow(BluetoothShare._ID));

        if (info.mUri != null) {

            info.mUri =

                    Uri.parse(stringFromCursor(info.mUri.toString(), cursor, BluetoothShare.URI));

            String uriString = stringFromCursor(info.mUri.toString(), cursor, BluetoothShare.URI);

            if (uriString != null) {

                info.mUri = Uri.parse(uriString);

            }

        } else {

            Log.w(TAG, "updateShare() called for ID " + info.mId + " with null URI");

        }