From 00dcbd7f57d7f41b7c4d9d02d23365d02c5d89a8 Mon Sep 17 00:00:00 2001
From: MarijnS95 <marijns95@gmail.com>
Date: Fri, 22 May 2020 17:57:25 +0200
Subject: [PATCH 1/3] Remove unnecessary, deprecated sharedUserId with system

sharedUserId is a deprecated flag [1] that muddies the waters when it
comes to enforcement of various policies and permissions. QcRilAm
doesn't use any and operates just fine within normal app boundaries
(uses public APIs, doesn't need any permissions outside "normal" ones,
and accesses vendor services properly over Binder).
This also allows the signing key to differ from platform, where other
android.uid.system apps are signed with.

[1] https://developer.android.com/guide/topics/manifest/manifest-element#uid

Signed-off-by: MarijnS95 <marijns95@gmail.com>
---
 AndroidManifest.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4170f92..97bfe50 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.sony.qcrilam"
     coreApp="true"
-    android:sharedUserId="android.uid.system"
     android:versionCode="1"
     android:versionName="1.0" >
 

From 331833e6b691e0a3969a37833f5047fa1cc0c1c5 Mon Sep 17 00:00:00 2001
From: ix5 <ix5@users.noreply.github.com>
Date: Tue, 26 May 2020 19:51:39 +0200
Subject: [PATCH 2/3] QcRilAmService: Wait for IQcRilAudio to be up

The default call to getService of a HIDL/AIDL interface will
not wait for the service to be up. Use the retry parameter
to use tryGetService internally.

This will fix a deprecation warning on future Android versions.

See https://android-review.googlesource.com/c/platform/system/tools/hidl/+/1291900
---
 src/com/sony/qcrilam/QcRilAmService.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/sony/qcrilam/QcRilAmService.kt b/src/com/sony/qcrilam/QcRilAmService.kt
index ef91dab..b0d70a0 100644
--- a/src/com/sony/qcrilam/QcRilAmService.kt
+++ b/src/com/sony/qcrilam/QcRilAmService.kt
@@ -35,7 +35,7 @@ class QcRilAmService : Service() {
 
     private fun addCallbackForSimSlot(simSlotNo: Int, audioManager: AudioManager) {
         try {
-            val qcRilAudio = IQcRilAudio.getService("slot$simSlotNo")
+            val qcRilAudio = IQcRilAudio.getService("slot$simSlotNo", true /*retry*/)
             if (qcRilAudio == null) {
                 Log.e(TAG, "Could not get service instance for slot$simSlotNo, failing")
             } else {

From 82eee5814b928f6b30ae1e1a52e3bd727a381ca9 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Mon, 7 Nov 2022 22:15:15 -0500
Subject: [PATCH 3/3] Android.bp: correct HIDL path

---
 Android.bp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index b60e265..00774da 100755
--- a/Android.bp
+++ b/Android.bp
@@ -4,7 +4,7 @@ subdirs = [
 
 hidl_package_root {
     name: "vendor.qti.hardware.radio.am",
-    path: "vendor/oss/qcrilam/interface/am",
+    path: "packages/apps/QcRilAm/interface/am",
 }
 
 android_app {