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

Commit 0bb8346e authored by Brian Delwiche's avatar Brian Delwiche Committed by Automerger Merge Worker
Browse files

Merge "Fix URI check in BluetoothOppUtility.java" into tm-dev am: 32ad0646... 

Merge "Fix URI check in BluetoothOppUtility.java" into tm-dev am: 32ad0646 am: 0268b990 am: 1ec0093e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/20077612



Change-Id: I2b237b4bd46227d2739f63d4cdab3cc1af227663
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 050dcd71 1ec0093e

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) {