Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 163be61c: Merge change 25412 into eclair

Browse Source 
Merge commit '163be61ce5ea85181da3a8908adaa63b5ff56a7e' into eclair-plus-aosp

* commit '163be61ce5ea85181da3a8908adaa63b5ff56a7e':
  Make ParcelUuid helper functions consistent.
This commit is contained in:
Jaikumar Ganesh
2009-09-21 12:46:08 -07:00
committed by Android Git Automerger
parent 91ec57e1bd 163be61ce5
commit b1d0794705
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/bluetooth/BluetoothUuid.java
View File

@@ -98,7 +98,14 @@ public final class BluetoothUuid {
*/ */
public static boolean containsAnyUuid(ParcelUuid[] uuidA, ParcelUuid[] uuidB) { public static boolean containsAnyUuid(ParcelUuid[] uuidA, ParcelUuid[] uuidB) {
if (uuidA == null && uuidB == null) return true; if (uuidA == null && uuidB == null) return true;
if (uuidA == null || uuidB == null) return false;
if (uuidA == null) {
return uuidB.length == 0 ? true : false;
}
if (uuidB == null) {
return uuidA.length == 0 ? true : false;
}
HashSet<ParcelUuid> uuidSet = new HashSet<ParcelUuid> (Arrays.asList(uuidA)); HashSet<ParcelUuid> uuidSet = new HashSet<ParcelUuid> (Arrays.asList(uuidA));
for (ParcelUuid uuid: uuidB) { for (ParcelUuid uuid: uuidB) {
@@ -117,7 +124,12 @@ public final class BluetoothUuid {
*/ */
public static boolean containsAllUuids(ParcelUuid[] uuidA, ParcelUuid[] uuidB) { public static boolean containsAllUuids(ParcelUuid[] uuidA, ParcelUuid[] uuidB) {
if (uuidA == null && uuidB == null) return true; if (uuidA == null && uuidB == null) return true;
if (uuidA == null || uuidB == null) return false;
if (uuidA == null) {
return uuidB.length == 0 ? true : false;
}
if (uuidB == null) return true;
HashSet<ParcelUuid> uuidSet = new HashSet<ParcelUuid> (Arrays.asList(uuidA)); HashSet<ParcelUuid> uuidSet = new HashSet<ParcelUuid> (Arrays.asList(uuidA));
for (ParcelUuid uuid: uuidB) { for (ParcelUuid uuid: uuidB) {