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

Unverified Commit ad69ba8f authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-10.0.0_r73' of... 

Merge tag 'android-security-10.0.0_r73' of https://android.googlesource.com/platform/packages/apps/Bluetooth into staging/lineage-17.1_merge_android-security-10.0.0_r73

Android Security 10.0.0 Release 73 (9269285)

* tag 'android-security-10.0.0_r73' of https://android.googlesource.com/platform/packages/apps/Bluetooth:
  Fix URI check in BluetoothOppUtility.java

Change-Id: I96a327d664b70e784afe9b1404edba06a6f1e910
parents d0110a17 ebfdae4a

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

+6 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import android.database.Cursor; 
import android.net.Uri;

import android.os.Environment;

import android.os.SystemProperties;

import android.util.EventLog;

import android.util.Log;



import com.android.bluetooth.R;
@@ -75,7 +76,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) {