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

Commit e292a90d authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [20078165] into security-aosp-rvc-release. 

Change-Id: I5ab63a17ea64ce8b561b92b06bf009d5ada337ad
parents e9f346fb 4be79042

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

+6 −1
Original line number Diff line number Diff line
@@ -47,6 +47,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;
@@ -74,7 +75,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) {