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

Commit 794633dc authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Android (Google) Code Review
Browse files

Merge "RDS PI is a number, not a string."

parents 0a198384 d6e269ae

core/java/android/hardware/radio/RadioMetadata.java

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ public final class RadioMetadata implements Parcelable { 


    static {

        METADATA_KEYS_TYPE = new ArrayMap<String, Integer>();

        METADATA_KEYS_TYPE.put(METADATA_KEY_RDS_PI, METADATA_TYPE_TEXT);

        METADATA_KEYS_TYPE.put(METADATA_KEY_RDS_PI, METADATA_TYPE_INT);

        METADATA_KEYS_TYPE.put(METADATA_KEY_RDS_PS, METADATA_TYPE_TEXT);

        METADATA_KEYS_TYPE.put(METADATA_KEY_RDS_PTY, METADATA_TYPE_INT);

        METADATA_KEYS_TYPE.put(METADATA_KEY_RBDS_PTY, METADATA_TYPE_INT);
@@ -385,7 +385,6 @@ public final class RadioMetadata implements Parcelable { 
         * the METADATA_KEYs defined in this class are used they may only be one

         * of the following:

         * <ul>

         * <li>{@link #METADATA_KEY_RDS_PI}</li>

         * <li>{@link #METADATA_KEY_RDS_PS}</li>

         * <li>{@link #METADATA_KEY_RDS_RT}</li>

         * <li>{@link #METADATA_KEY_TITLE}</li>
@@ -413,6 +412,7 @@ public final class RadioMetadata implements Parcelable { 
         * the METADATA_KEYs defined in this class are used they may only be one

         * of the following:

         * <ul>

         * <li>{@link #METADATA_KEY_RDS_PI}</li>

         * <li>{@link #METADATA_KEY_RDS_PTY}</li>

         * <li>{@link #METADATA_KEY_RBDS_PTY}</li>

         * </ul>