From 95e7624f55c8a5f385516ad7f759498d11e64dea Mon Sep 17 00:00:00 2001
From: roynatech2544 <whiteshell2544@naver.com>
Date: Sat, 29 Oct 2022 19:04:41 +0900
Subject: [PATCH] universal7885: FMRadio: Switch to FM V3 aidl interface

---
 universal7885-common/apps/FMRadio/Android.bp                   | 2 +-
 .../apps/FMRadio/src/com/eurekateam/fmradio/MainActivity.kt    | 3 +++
 .../src/com/eurekateam/fmradio/adapters/ListViewAdapter.kt     | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/universal7885-common/apps/FMRadio/Android.bp b/universal7885-common/apps/FMRadio/Android.bp
index ffb9490..aeadcde 100644
--- a/universal7885-common/apps/FMRadio/Android.bp
+++ b/universal7885-common/apps/FMRadio/Android.bp
@@ -12,7 +12,7 @@ android_app {
         "com.google.android.material_stable",
         "androidx.transition_transition",
         "androidx.coordinatorlayout_coordinatorlayout",
-        "vendor.eureka.hardware.fmradio-V2-java",
+        "vendor.eureka.hardware.fmradio-V3-java",
     ],
     required: [
         "vendor.eureka.hardware.fmradio-service",
diff --git a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/MainActivity.kt b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/MainActivity.kt
index 527c3c0..8ced06a 100644
--- a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/MainActivity.kt
+++ b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/MainActivity.kt
@@ -7,6 +7,7 @@ import android.media.AudioManager
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
+import android.os.Process
 import android.view.LayoutInflater
 import android.view.View
 import androidx.appcompat.app.AlertDialog
@@ -23,6 +24,7 @@ import com.eurekateam.fmradio.utils.Log
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.android.material.color.DynamicColors
 import com.google.android.material.textview.MaterialTextView
+import vendor.eureka.hardware.fmradio.SetType
 
 class MainActivity : AppCompatActivity() {
     private lateinit var mIntent: Intent
@@ -55,6 +57,7 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_navigation)
         DynamicColors.applyToActivitiesIfAvailable(application)
+        mFMInterface.mDevCtl.setValue(SetType.SET_TYPE_FM_APP_PID, Process.myPid())
         mFMInterface.mDevCtl.open()
         mAudioManager = getSystemService(AUDIO_SERVICE) as AudioManager
 
diff --git a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/adapters/ListViewAdapter.kt b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/adapters/ListViewAdapter.kt
index aec5961..e2244e5 100644
--- a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/adapters/ListViewAdapter.kt
+++ b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/adapters/ListViewAdapter.kt
@@ -17,7 +17,7 @@ import vendor.eureka.hardware.fmradio.SetType
 
 class ListViewAdapter(private val mContext: Context) : BaseAdapter() {
     private val mFMInterface = NativeFMInterface()
-    private val mListChannel = mFMInterface.mDefaultCtl.getFreqsList().sort()
+    private val mListChannel = mFMInterface.mDefaultCtl.getFreqsList().apply{ sort() }
     private var mListofViews = HashMap<Int, View>(30)
     private var mInitDoneArray = Array(30){ false }