Merge branch 'dev/10/fp2/security-aosp-qt-release' into int/10/fp2
* dev/10/fp2/security-aosp-qt-release:
Fix OPP comparison
Change-Id: I497be7bf80bcab85ac4d3d2b732219e57c562ebd
diff --git a/src/com/android/bluetooth/opp/BluetoothOppUtility.java b/src/com/android/bluetooth/opp/BluetoothOppUtility.java
index 7fdbe13..b0878e8 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppUtility.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppUtility.java
@@ -60,6 +60,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -77,10 +78,10 @@
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) {