summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-12-06 03:15:42 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-12-06 03:15:42 +0000
commit06a35c4f4865ae4e9a77fb9faaf08b41f3f32f7d (patch)
treebd06471b2290d8995e8e13fdd781322d41ea2949
parent1a876a5c1ce34180b564038fa0ae729e9d77dd2b (diff)
parent47987b5c2a422b8d7527f702a1216d7ba7867f9e (diff)
downloadBluetooth-android12L-gsi.tar.gz
Merge "Merge cherrypicks of [20078165] into sc-v2-platform-release. am: 883c34981f" into android12L-gsiandroid12L-gsi
-rw-r--r--src/com/android/bluetooth/opp/BluetoothOppUtility.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/bluetooth/opp/BluetoothOppUtility.java b/src/com/android/bluetooth/opp/BluetoothOppUtility.java
index 577928d3f..96c3ac5f5 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppUtility.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppUtility.java
@@ -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) {