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

Commit 0576dbce authored by Weilin Xu's avatar Weilin Xu Committed by Cherrypicker Worker
Browse files

Fixed metadata label in AIDL radio HAL Metadata 

Bug: 287517076
Test: atest VtsHalBroadcastradioAidlTargetTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:285598dde00128cfc5fa5a9f7b7847d31daf3620)
Merged-In: I612ca079bda6f47446ec75ca7b4fece7317bd56d
Change-Id: I612ca079bda6f47446ec75ca7b4fece7317bd56d
parent f135fd87

broadcastradio/aidl/android/hardware/broadcastradio/Metadata.aidl

+11 −7
Original line number Original line Diff line number Diff line
@@ -70,9 +70,9 @@ union Metadata { 
    /**

    /**

     * Station name.

     * Station name.

     *

     *

     * This is a generic field to cover any radio technology.

     * <p>This is a generic field to cover any radio technology.

     *

     *

     * If the PROGRAM_NAME has the same content as DAB_*_NAME or RDS_PS,

     * <p>Note: If the program name has the same content as dab*Name or ({@link Metadata#rdsPs},

     * it may not be present, to preserve space - framework must repopulate

     * it may not be present, to preserve space - framework must repopulate

     * it on the client side.

     * it on the client side.

     */

     */
@@ -86,10 +86,10 @@ union Metadata { 
    /**

    /**

     * DAB ensemble name abbreviated (string).

     * DAB ensemble name abbreviated (string).

     *

     *

     * The string must be up to 8 characters long.

     * <p>Note: The string must be up to 8 characters long.

     *

     *

     * If the short variant is present, the long (DAB_ENSEMBLE_NAME) one must be

     * <p>Note: If the short variant is present, the long ({@link Metadata#dabEnsembleName})

     * present as well.

     * one must be present as well.

     */

     */

    String dabEnsembleNameShort;

    String dabEnsembleNameShort;
@@ -99,7 +99,9 @@ union Metadata { 
    String dabServiceName;

    String dabServiceName;





    /**

    /**

     * DAB service name abbreviated (see DAB_ENSEMBLE_NAME_SHORT) (string)

     * DAB service name abbreviated (string)

     *

     * <p>Note: The string must be up to 8 characters long.

     */

     */

    String dabServiceNameShort;

    String dabServiceNameShort;
@@ -109,7 +111,9 @@ union Metadata { 
    String dabComponentName;

    String dabComponentName;





    /**

    /**

     * DAB component name abbreviated (see DAB_ENSEMBLE_NAME_SHORT) (string)

     * DAB component name abbreviated (string)

     *

     * <p>Note: The string must be up to 8 characters long.

     */

     */

    String dabComponentNameShort;

    String dabComponentNameShort;

}
 
}