commit 4ea5e82c30f49491b01d8472ed6aca0944ba3dbb
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Oct 18 07:24:14 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Oct 18 07:24:14 2022 +0000
tree 55d4a033989f3aa2de66c57116b929f66deaef2c
parent 90a8c0dd4f1f7513d88f5b27e2a42b90d4a21bca
parent 624a015c64bdb6b970e0398d5ffdf556c0566634

Merge cherrypicks of [20078165] into rvc-platform-release.

Change-Id: Ic8ac4bbe79832e7b371a2046b2608d7e5acb3a52

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

diff --git a/src/com/android/bluetooth/opp/BluetoothOppUtility.java b/src/com/android/bluetooth/opp/BluetoothOppUtility.java
index 577928d..96c3ac5 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppUtility.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppUtility.java
@@ -47,6 +47,7 @@
 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 @@
             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) {