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

Commit d9948659 authored by Brian Delwiche's avatar Brian Delwiche Committed by Android (Google) Code Review
Browse files

Merge "Fix OPP comparison" into tm-dev

parents f8adec66 bbbbdb52

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

+3 −2
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import java.util.HashMap; 
import java.util.List;

import java.util.Locale;

import java.util.Map;

import java.util.Objects;

import java.util.concurrent.ConcurrentHashMap;



/**
@@ -80,10 +81,10 @@ public class BluetoothOppUtility { 


    public static boolean isBluetoothShareUri(Uri uri) {

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

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

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

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

        }

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

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

    }



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