From 33d00704d6c04327350c42d87aa74da5ccfaf865 Mon Sep 17 00:00:00 2001 From: Tomasz Wasilczyk Date: Mon, 26 Jun 2017 16:10:19 -0700 Subject: [PATCH] Fix Broadcast Radio test to not fail on HD Radio. Bug: b/36864090 Test: instrumentalization Change-Id: I8dc02904cd394c47e50dd161d6329529c531032d --- tests/radio/src/android/hardware/radio/tests/RadioTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/radio/src/android/hardware/radio/tests/RadioTest.java b/tests/radio/src/android/hardware/radio/tests/RadioTest.java index 82ce4393f44a6..b7a5ac4eb19b6 100644 --- a/tests/radio/src/android/hardware/radio/tests/RadioTest.java +++ b/tests/radio/src/android/hardware/radio/tests/RadioTest.java @@ -123,10 +123,11 @@ public class RadioTest { // find FM band and build its config mModule = mModules.get(0); for (RadioManager.BandDescriptor band : mModule.getBands()) { - if (band.getType() == RadioManager.BAND_AM) { + int bandType = band.getType(); + if (bandType == RadioManager.BAND_AM || bandType == RadioManager.BAND_AM_HD) { mAmBandDescriptor = (RadioManager.AmBandDescriptor)band; } - if (band.getType() == RadioManager.BAND_FM) { + if (bandType == RadioManager.BAND_FM || bandType == RadioManager.BAND_FM_HD) { mFmBandDescriptor = (RadioManager.FmBandDescriptor)band; } }