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

Commit 86f7d641 authored by Brian Delwiche's avatar Brian Delwiche Committed by Android Build Coastguard Worker
Browse files

Fix URI check in BluetoothOppUtility.java 

Bug: 225880741
Test: BT unit tests, validated against researcher POC
Tag: #security
Ignore-AOSP-First: Security
Change-Id: I1330080abfd638fb36aad9535b6f5f5872986a7f
(cherry picked from commit 29a297b4)
Merged-In: I1330080abfd638fb36aad9535b6f5f5872986a7f
parent 7de61cea

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

+6 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import android.net.Uri; 
import android.os.Environment;

import android.os.ParcelFileDescriptor;

import android.os.SystemProperties;

import android.util.EventLog;

import android.util.Log;



import com.android.bluetooth.R;
@@ -78,7 +79,11 @@ public class BluetoothOppUtility { 
            new ConcurrentHashMap<Uri, BluetoothOppSendFileInfo>();



    public static boolean isBluetoothShareUri(Uri uri) {

        return uri.toString().startsWith(BluetoothShare.CONTENT_URI.toString());

        if (uri.toString().startsWith(BluetoothShare.CONTENT_URI.toString())

                && !uri.getAuthority().equals(BluetoothShare.CONTENT_URI.getAuthority())) {

            EventLog.writeEvent(0x534e4554, "225880741", -1, "");

        }

        return uri.getAuthority().equals(BluetoothShare.CONTENT_URI.getAuthority());

    }



    public static BluetoothOppTransferInfo queryRecord(Context context, Uri uri) {