Snap for 4829593 from fa3700297aba2d5a092a7e8a284d1c1110083af4 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r3android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r2android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-cts-release

Change-Id: I2f754d3be02e18147afd41ffc40949615f82d00c

3 files changed, 11 insertions, 4 deletions

diff --git a/car-broadcastradio-support/Android.mk b/car-broadcastradio-support/Android.mk
index 11b01aed..ac4d6638 100644
--- a/car-broadcastradio-support/Android.mk
+++ b/car-broadcastradio-support/Android.mk
@@ -30,8 +30,12 @@ LOCAL_PRIVILEGED_MODULE := true
 LOCAL_PROGUARD_ENABLED := disabled
 LOCAL_USE_AAPT2 := true
 
-LOCAL_STATIC_ANDROID_LIBRARIES := \
+LOCAL_SHARED_ANDROID_LIBRARIES := \
     android-support-v4 \
     car-media-common
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
+
+ifeq ($(BOARD_IS_AUTOMOTIVE), true)
+$(call dist-for-goals,dist_files,$(full_classes_jar):$(LOCAL_MODULE).jar)
+endif
diff --git a/car-broadcastradio-support/src/com/android/car/broadcastradio/support/platform/ProgramSelectorExt.java b/car-broadcastradio-support/src/com/android/car/broadcastradio/support/platform/ProgramSelectorExt.java
index 6d074379..1eff91fb 100644
--- a/car-broadcastradio-support/src/com/android/car/broadcastradio/support/platform/ProgramSelectorExt.java
+++ b/car-broadcastradio-support/src/com/android/car/broadcastradio/support/platform/ProgramSelectorExt.java
@@ -201,8 +201,11 @@ public class ProgramSelectorExt {
      * @return new ProgramSelector object representing given frequency.
      * @throws IllegalArgumentException if provided frequency is out of bounds.
      */
-    public static @NonNull ProgramSelector createAmFmSelector(int frequencyKhz) {
-        return ProgramSelector.createAmFmSelector(RadioManager.BAND_INVALID, frequencyKhz);
+    public static @NonNull ProgramSelector createAmFmSelector(long frequencyKhz) {
+        if (frequencyKhz < 0 || frequencyKhz > Integer.MAX_VALUE) {
+            throw new IllegalArgumentException("illegal frequency value: " + frequencyKhz);
+        }
+        return ProgramSelector.createAmFmSelector(RadioManager.BAND_INVALID, (int) frequencyKhz);
     }
 
     /**
diff --git a/car-settings-lib/res/values-night/colors.xml b/car-settings-lib/res/values-night/colors.xml
index 080de937..cc91575f 100644
--- a/car-settings-lib/res/values-night/colors.xml
+++ b/car-settings-lib/res/values-night/colors.xml
@@ -15,7 +15,7 @@
     limitations under the License.
 -->
 <resources>
-    <color name="windowBackground">@color/car_dark_blue_grey_700</color>
+    <color name="windowBackground">#121214</color>
     <color name="colorPrimaryDark">@color/car_dark_blue_grey_800</color>
 
     <color name="blue_600">@color/blue_600_light</color>