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

Commit 95f187b5 authored by Weilin Xu's avatar Weilin Xu
Browse files

Improved HD radio support in broadcast radio HAL 

Added identifier types, program info flags and metadata needed for
HD radio in AIDL broadcast radio HAL. Depracated SXM identifier
types since SXM is not supported.

Bug: 280300929
Test: atest VtsHalBroadcastradioAidlTargetTest
Change-Id: I822b43e6452c308db1259b99b961378c14c8b294
parent a7867cec

broadcastradio/aidl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -43,6 +43,6 @@ aidl_interface { 
            imports: [],

        },

    ],

    frozen: true,

    frozen: false,



}

broadcastradio/aidl/aidl_api/android.hardware.broadcastradio/current/android/hardware/broadcastradio/AmFmRegionConfig.aidl

+4 −4
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ parcelable AmFmRegionConfig { 
  android.hardware.broadcastradio.AmFmBandRange[] ranges;

  int fmDeemphasis;

  int fmRds;

  const int DEEMPHASIS_D50 = (1 << 0);

  const int DEEMPHASIS_D75 = (1 << 1);

  const int RDS = (1 << 0);

  const int RBDS = (1 << 1);

  const int DEEMPHASIS_D50 = (1 << 0) /* 1 */;

  const int DEEMPHASIS_D75 = (1 << 1) /* 2 */;

  const int RDS = (1 << 0) /* 1 */;

  const int RBDS = (1 << 1) /* 2 */;

}

broadcastradio/aidl/aidl_api/android.hardware.broadcastradio/current/android/hardware/broadcastradio/ConfigFlag.aidl

+5 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ package android.hardware.broadcastradio; 
@Backing(type="int") @JavaDerive(equals=true, toString=true) @VintfStability

enum ConfigFlag {

  FORCE_MONO = 1,

  /**

   * @deprecated Use {link #FORCE_ANALOG_FM} instead

   */

  FORCE_ANALOG,

  FORCE_DIGITAL,

  RDS_AF,
@@ -43,4 +46,6 @@ enum ConfigFlag { 
  DAB_FM_LINKING,

  DAB_DAB_SOFT_LINKING,

  DAB_FM_SOFT_LINKING,

  FORCE_ANALOG_FM,

  FORCE_ANALOG_AM,

}

broadcastradio/aidl/aidl_api/android.hardware.broadcastradio/current/android/hardware/broadcastradio/HdSubChannel.aidl

0 → 100644
+45 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.broadcastradio;

@Backing(type="int") @JavaDerive(equals=true, toString=true) @VintfStability

enum HdSubChannel {

  HD1 = 0,

  HD2 = 1,

  HD3 = 2,

  HD4 = 3,

  HD5 = 4,

  HD6 = 5,

  HD7 = 6,

  HD8 = 7,

}

broadcastradio/aidl/aidl_api/android.hardware.broadcastradio/current/android/hardware/broadcastradio/IdentifierType.aidl

+8 −1
Original line number Diff line number Diff line
@@ -47,6 +47,13 @@ enum IdentifierType { 
  DAB_FREQUENCY_KHZ,

  DRMO_SERVICE_ID,

  DRMO_FREQUENCY_KHZ,

  SXM_SERVICE_ID = (DRMO_FREQUENCY_KHZ + 2),

  /**

   * @deprecated SiriusXM Satellite Radio is not supported.

   */

  SXM_SERVICE_ID = (DRMO_FREQUENCY_KHZ + 2) /* 12 */,

  /**

   * @deprecated SiriusXM Satellite Radio is not supported.

   */

  SXM_CHANNEL,

  HD_STATION_LOCATION,

}