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

Commit 93fe39ef authored by Weilin Xu's avatar Weilin Xu
Browse files

Fix secondary ids comparison in strictEquals 

Since the comparator of identifer is not implemented, secondary
ids cannot be sorted in ProgramSelector constructor. Two secondary
id arrays should be compared using list in strictEquals method.

Bug: 249616039
Test: atest ProgramSelectorTest#
strictEquals_withDifferentSecondaryIdsOrders_returnsTrue

Change-Id: I2460c4399ff8564b638254f71e9d7c883868854a
parent 06e1cc48

core/java/android/hardware/radio/ProgramSelector.java

+3 −2
Original line number Diff line number Diff line
@@ -279,7 +279,6 @@ public final class ProgramSelector implements Parcelable { 
        mPrimaryId = Objects.requireNonNull(primaryId);

        mSecondaryIds = secondaryIds;

        mVendorIds = vendorIds;

        Arrays.sort(mSecondaryIds);

    }



    /**
@@ -525,7 +524,9 @@ public final class ProgramSelector implements Parcelable { 
        // vendorIds are ignored for equality

        // programType can be inferred from primaryId, thus not checked

        return mPrimaryId.equals(other.getPrimaryId())

                && Arrays.equals(mSecondaryIds, other.mSecondaryIds);

                && mSecondaryIds.length == other.mSecondaryIds.length

                && Arrays.asList(mSecondaryIds).containsAll(

                        Arrays.asList(other.mSecondaryIds));

    }



    private ProgramSelector(Parcel in) {