Merge c60878ab2f2a14f54d6dad434c19198aed8efa38 on remote branch
Change-Id: I12d849f0d32bfec7a21a641ea8c35aa45195c38f
diff --git a/fmapp2/AndroidManifest.xml b/fmapp2/AndroidManifest.xml
index 833250c..ad57884 100644
--- a/fmapp2/AndroidManifest.xml
+++ b/fmapp2/AndroidManifest.xml
@@ -29,7 +29,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.caf.fmradio" >
- <uses-sdk android:minSdkVersion="34" android:targetSdkVersion="34"/>
+ <uses-sdk android:minSdkVersion="35" android:targetSdkVersion="35"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.BLUETOOTH" />
@@ -63,6 +63,7 @@
<activity android:icon="@drawable/ic_launcher_fmradio"
android:name=".FMRadio"
android:label="@string/app_name"
+ android:theme="@style/OptOutEdgeToEdge"
android:clearTaskOnLaunch="true"
android:allowTaskReparenting="true"
android:launchMode="singleTask"
diff --git a/fmapp2/res/values/styles.xml b/fmapp2/res/values/styles.xml
index e9c9bcf..ee3c8b8 100644
--- a/fmapp2/res/values/styles.xml
+++ b/fmapp2/res/values/styles.xml
@@ -27,6 +27,10 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<resources>
+ <style name="OptOutEdgeToEdge">
+ <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+ </style>
+
<style name="FMStationSeekBar">
<item name="android:indeterminateOnly">false</item>
<item name="android:progressDrawable">@android:drawable/progress_horizontal</item>
diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java
index 4807355..7ac7eee 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -1239,7 +1239,7 @@
mRecorder.setAudioSource(MediaRecorder.AudioSource.RADIO_TUNER);
mRecorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
mRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
- final int samplingRate = 44100;
+ final int samplingRate = 48000;
mRecorder.setAudioSamplingRate(samplingRate);
final int bitRate = 128000;
mRecorder.setAudioEncodingBitRate(bitRate);