Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dca2f0fe authored by Jaikumar Ganesh's avatar Jaikumar Ganesh
Browse files

Make ParcelUuid helper functions consistent. 

Treat zero length arrays and null arrays to be same.

Change-Id: I8c6c28e5dc3da1f31f6f6abfc747db4c2975a90b
parent dd0463ae

core/java/android/bluetooth/BluetoothUuid.java

+14 −2
Original line number Original line Diff line number Diff line
@@ -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) {