diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-12-06 02:43:28 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-12-06 02:43:28 +0000 |
commit | 882dc34878101703e0af9952591b69040fac4173 (patch) | |
tree | e646fb5b6e00d9ac9e8b8b926b5200a5653bd3df | |
parent | b29839480d9723d2127c19629ef5a0b926f4edb6 (diff) | |
parent | b2014cc30b26ff5138b4120fe3927e84109826a6 (diff) | |
download | Bluetooth-android12-gsi.tar.gz |
Merge "Merge cherrypicks of [20078165] into sc-platform-release. am: ee7e509b3e" into android12-gsiandroid12-gsi
-rw-r--r-- | src/com/android/bluetooth/opp/BluetoothOppUtility.java | 7 |
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) { |