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

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

Merge "OPP: Check uri string before parse it" am: e25c5940 am: f25ff13a... 

Merge "OPP: Check uri string before parse it" am: e25c5940 am: f25ff13a am: 5d426be6 am: dd44eef1

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

Change-Id: I5400d806fcf5737a62a4727cbbb188fc0ffaccf4
parents 1622f58f dd44eef1

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

        }