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

Commit f6c673b4 authored by Weilin Xu's avatar Weilin Xu
Browse files

Enable toString for Result in broadcast radio HAL 

ToString is enabled for Result enum in AIDL broadcast radio HAL. Some
automatic generated files were also modified when updating this AIDL
API.

Bug: 264931778
Test: atest VtsHalBroadcastradioAidlTargetTest
Change-Id: Ia4ac02a95adbbcceac90c5b5106a7ea52dc447e9
parent c4447be4

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

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

  android.hardware.broadcastradio.AmFmBandRange[] ranges;

  int fmDeemphasis;

  int fmDeemphasis;

  int fmRds;

  int fmRds;

  const int DEEMPHASIS_D50 = 1;

  const int DEEMPHASIS_D50 = (1 << 0);

  const int DEEMPHASIS_D75 = 2;

  const int DEEMPHASIS_D75 = (1 << 1);

  const int RDS = 1;

  const int RDS = (1 << 0);

  const int RBDS = 2;

  const int RBDS = (1 << 1);

}
 
}

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

+7 −7
Original line number Original line Diff line number Diff line
@@ -36,11 +36,11 @@ package android.hardware.broadcastradio; 
enum AnnouncementType {

enum AnnouncementType {

  INVALID = 0,

  INVALID = 0,

  EMERGENCY = 1,

  EMERGENCY = 1,

  WARNING = 2,

  WARNING,

  TRAFFIC = 3,

  TRAFFIC,

  WEATHER = 4,

  WEATHER,

  NEWS = 5,

  NEWS,

  EVENT = 6,

  EVENT,

  SPORT = 7,

  SPORT,

  MISC = 8,

  MISC,

}
 
}

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

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

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

enum ConfigFlag {

enum ConfigFlag {

  FORCE_MONO = 1,

  FORCE_MONO = 1,

  FORCE_ANALOG = 2,

  FORCE_ANALOG,

  FORCE_DIGITAL = 3,

  FORCE_DIGITAL,

  RDS_AF = 4,

  RDS_AF,

  RDS_REG = 5,

  RDS_REG,

  DAB_DAB_LINKING = 6,

  DAB_DAB_LINKING,

  DAB_FM_LINKING = 7,

  DAB_FM_LINKING,

  DAB_DAB_SOFT_LINKING = 8,

  DAB_DAB_SOFT_LINKING,

  DAB_FM_SOFT_LINKING = 9,

  DAB_FM_SOFT_LINKING,

}
 
}

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

+12 −12
Original line number Original line Diff line number Diff line
@@ -37,16 +37,16 @@ enum IdentifierType { 
  VENDOR_START = 1000,

  VENDOR_START = 1000,

  VENDOR_END = 1999,

  VENDOR_END = 1999,

  INVALID = 0,

  INVALID = 0,

  AMFM_FREQUENCY_KHZ = 1,

  AMFM_FREQUENCY_KHZ,

  RDS_PI = 2,

  RDS_PI,

  HD_STATION_ID_EXT = 3,

  HD_STATION_ID_EXT,

  HD_STATION_NAME = 4,

  HD_STATION_NAME,

  DAB_SID_EXT = 5,

  DAB_SID_EXT,

  DAB_ENSEMBLE = 6,

  DAB_ENSEMBLE,

  DAB_SCID = 7,

  DAB_SCID,

  DAB_FREQUENCY_KHZ = 8,

  DAB_FREQUENCY_KHZ,

  DRMO_SERVICE_ID = 9,

  DRMO_SERVICE_ID,

  DRMO_FREQUENCY_KHZ = 10,

  DRMO_FREQUENCY_KHZ,

  SXM_SERVICE_ID = 12,

  SXM_SERVICE_ID = (DRMO_FREQUENCY_KHZ + 2),

  SXM_CHANNEL = 13,

  SXM_CHANNEL,

}
 
}

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

+6 −6
Original line number Original line Diff line number Diff line
@@ -42,10 +42,10 @@ parcelable ProgramInfo { 
  int signalQuality;

  int signalQuality;

  android.hardware.broadcastradio.Metadata[] metadata;

  android.hardware.broadcastradio.Metadata[] metadata;

  android.hardware.broadcastradio.VendorKeyValue[] vendorInfo;

  android.hardware.broadcastradio.VendorKeyValue[] vendorInfo;

  const int FLAG_LIVE = 1;

  const int FLAG_LIVE = (1 << 0);

  const int FLAG_MUTED = 2;

  const int FLAG_MUTED = (1 << 1);

  const int FLAG_TRAFFIC_PROGRAM = 4;

  const int FLAG_TRAFFIC_PROGRAM = (1 << 2);

  const int FLAG_TRAFFIC_ANNOUNCEMENT = 8;

  const int FLAG_TRAFFIC_ANNOUNCEMENT = (1 << 3);

  const int FLAG_TUNABLE = 16;

  const int FLAG_TUNABLE = (1 << 4);

  const int FLAG_STEREO = 32;

  const int FLAG_STEREO = (1 << 5);

}
 
}