From 04510b8a2f5aedc0569f7883512579c63d049ee8 Mon Sep 17 00:00:00 2001
From: Weilin Xu <xuweilin@google.com>
Date: Wed, 15 Mar 2023 23:51:39 +0000
Subject: [PATCH] Remove DAB selector secondary ids check in service

Secondary ids for DAB selector, ensemble and frequency are not
mandatory, so the check for this is removed for better flexibilty
in tuning operation.

Bug: 273804622
Test: atest com.android.server.broadcastradio
Test: atest android.hardware.radio
Change-Id: Ic3293c70bd80f6bcefb6cea7c60768a83c5617a4
---
 .../aidl/ConversionUtilsTest.java             | 26 ---------------
 .../broadcastradio/aidl/ConversionUtils.java  | 32 ++++---------------
 2 files changed, 7 insertions(+), 51 deletions(-)

diff --git a/core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/aidl/ConversionUtilsTest.java b/core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/aidl/ConversionUtilsTest.java
index ba0579171c435..aea01783ee688 100644
--- a/core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/aidl/ConversionUtilsTest.java
+++ b/core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/aidl/ConversionUtilsTest.java
@@ -258,20 +258,6 @@ public final class ConversionUtilsTest extends ExtendedRadioMockitoTestCase {
                 .containsExactly(TEST_HAL_DAB_FREQUENCY_ID, TEST_HAL_DAB_ENSEMBLE_ID);
     }
 
-    @Test
-    public void programSelectorToHalProgramSelector_withInvalidDabSelector_returnsNull() {
-        ProgramSelector invalidDbSelector = new ProgramSelector(ProgramSelector.PROGRAM_TYPE_DAB,
-                TEST_DAB_SID_EXT_ID,
-                new ProgramSelector.Identifier[0],
-                new long[0]);
-
-        android.hardware.broadcastradio.ProgramSelector invalidHalDabSelector =
-                ConversionUtils.programSelectorToHalProgramSelector(invalidDbSelector);
-
-        expect.withMessage("Invalid HAL DAB selector without required secondary ids")
-                .that(invalidHalDabSelector).isNull();
-    }
-
     @Test
     public void programSelectorFromHalProgramSelector_withValidSelector() {
         android.hardware.broadcastradio.ProgramSelector halDabSelector =
@@ -288,18 +274,6 @@ public final class ConversionUtilsTest extends ExtendedRadioMockitoTestCase {
                 .containsExactly(TEST_DAB_FREQUENCY_ID, TEST_DAB_ENSEMBLE_ID);
     }
 
-    @Test
-    public void programSelectorFromHalProgramSelector_withInvalidSelector_returnsNull() {
-        android.hardware.broadcastradio.ProgramSelector invalidHalDabSelector =
-                AidlTestUtils.makeHalSelector(TEST_HAL_DAB_SID_EXT_ID, new ProgramIdentifier[]{});
-
-        ProgramSelector invalidDabSelector =
-                ConversionUtils.programSelectorFromHalProgramSelector(invalidHalDabSelector);
-
-        expect.withMessage("Invalid DAB selector without required secondary ids")
-                .that(invalidDabSelector).isNull();
-    }
-
     @Test
     public void programInfoFromHalProgramInfo_withValidProgramInfo() {
         android.hardware.broadcastradio.ProgramSelector halDabSelector =
diff --git a/services/core/java/com/android/server/broadcastradio/aidl/ConversionUtils.java b/services/core/java/com/android/server/broadcastradio/aidl/ConversionUtils.java
index 4f2bfd1c1e520..aab815c93e1a0 100644
--- a/services/core/java/com/android/server/broadcastradio/aidl/ConversionUtils.java
+++ b/services/core/java/com/android/server/broadcastradio/aidl/ConversionUtils.java
@@ -347,31 +347,13 @@ final class ConversionUtils {
 
     private static boolean isValidHalProgramSelector(
             android.hardware.broadcastradio.ProgramSelector sel) {
-        if (sel.primaryId.type != IdentifierType.AMFM_FREQUENCY_KHZ
-                && sel.primaryId.type != IdentifierType.RDS_PI
-                && sel.primaryId.type != IdentifierType.HD_STATION_ID_EXT
-                && sel.primaryId.type != IdentifierType.DAB_SID_EXT
-                && sel.primaryId.type != IdentifierType.DRMO_SERVICE_ID
-                && sel.primaryId.type != IdentifierType.SXM_SERVICE_ID
-                && !isVendorIdentifierType(sel.primaryId.type)) {
-            return false;
-        }
-        if (sel.primaryId.type == IdentifierType.DAB_SID_EXT) {
-            boolean hasEnsemble = false;
-            boolean hasFrequency = false;
-            for (int i = 0; i < sel.secondaryIds.length; i++) {
-                if (sel.secondaryIds[i].type == IdentifierType.DAB_ENSEMBLE) {
-                    hasEnsemble = true;
-                } else if (sel.secondaryIds[i].type == IdentifierType.DAB_FREQUENCY_KHZ) {
-                    hasFrequency = true;
-                }
-                if (hasEnsemble && hasFrequency) {
-                    return true;
-                }
-            }
-            return false;
-        }
-        return true;
+        return sel.primaryId.type == IdentifierType.AMFM_FREQUENCY_KHZ
+                || sel.primaryId.type == IdentifierType.RDS_PI
+                || sel.primaryId.type == IdentifierType.HD_STATION_ID_EXT
+                || sel.primaryId.type == IdentifierType.DAB_SID_EXT
+                || sel.primaryId.type == IdentifierType.DRMO_SERVICE_ID
+                || sel.primaryId.type == IdentifierType.SXM_SERVICE_ID
+                || isVendorIdentifierType(sel.primaryId.type);
     }
 
     @Nullable