mirror of
https://github.com/ponces/treble_aosp.git
synced 2024-11-24 20:16:22 +00:00
89 lines
3.5 KiB
Diff
89 lines
3.5 KiB
Diff
From 08f51ef7ee03d1c3bd0e99dbc5751d88c8bbb11c Mon Sep 17 00:00:00 2001
|
|
From: Alberto Ponces <ponces26@gmail.com>
|
|
Date: Sun, 31 Mar 2024 23:38:19 +0000
|
|
Subject: [PATCH 51/54] Revert "Remove deprecated IRadio <1.4 APIs and
|
|
references"
|
|
|
|
This reverts commit 4d53aa0caec7029bf6c9b5789c1708bc4bb71b76.
|
|
---
|
|
.../android/telephony/TelephonyManager.java | 23 +++++++++++++++++++
|
|
.../internal/telephony/ITelephony.aidl | 11 +++++++++
|
|
.../internal/telephony/RILConstants.java | 5 ++++
|
|
3 files changed, 39 insertions(+)
|
|
|
|
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
|
|
index 0c9601ad7b30..4ac056a15f1e 100644
|
|
--- a/telephony/java/android/telephony/TelephonyManager.java
|
|
+++ b/telephony/java/android/telephony/TelephonyManager.java
|
|
@@ -11488,6 +11488,29 @@ public class TelephonyManager {
|
|
return result;
|
|
}
|
|
|
|
+ /**
|
|
+ * Returns the result and response from RIL for oem request
|
|
+ *
|
|
+ * @param oemReq the data is sent to ril.
|
|
+ * @param oemResp the respose data from RIL.
|
|
+ * @return negative value request was not handled or get error
|
|
+ * 0 request was handled succesfully, but no response data
|
|
+ * positive value success, data length of response
|
|
+ * @hide
|
|
+ * @deprecated OEM needs a vendor-extension hal and their apps should use that instead
|
|
+ */
|
|
+ @Deprecated
|
|
+ public int invokeOemRilRequestRaw(byte[] oemReq, byte[] oemResp) {
|
|
+ try {
|
|
+ ITelephony telephony = getITelephony();
|
|
+ if (telephony != null)
|
|
+ return telephony.invokeOemRilRequestRaw(oemReq, oemResp);
|
|
+ } catch (RemoteException ex) {
|
|
+ } catch (NullPointerException ex) {
|
|
+ }
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
/**
|
|
* Shut down all the live radios over all the slot indexes.
|
|
*
|
|
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
|
|
index ff2ee27abc60..d7ca28c447a6 100644
|
|
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
|
|
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
|
|
@@ -1194,6 +1194,17 @@ interface ITelephony {
|
|
in List<String> gsmNonRoamingList, in List<String> cdmaRoamingList,
|
|
in List<String> cdmaNonRoamingList);
|
|
|
|
+ /**
|
|
+ * Returns the result and response from RIL for oem request
|
|
+ *
|
|
+ * @param oemReq the data is sent to ril.
|
|
+ * @param oemResp the respose data from RIL.
|
|
+ * @return negative value request was not handled or get error
|
|
+ * 0 request was handled succesfully, but no response data
|
|
+ * positive value success, data length of response
|
|
+ */
|
|
+ int invokeOemRilRequestRaw(in byte[] oemReq, out byte[] oemResp);
|
|
+
|
|
/**
|
|
* Check if any mobile Radios need to be shutdown.
|
|
*
|
|
diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java
|
|
index b7dd4df1c843..5f5e21916bd0 100644
|
|
--- a/telephony/java/com/android/internal/telephony/RILConstants.java
|
|
+++ b/telephony/java/com/android/internal/telephony/RILConstants.java
|
|
@@ -298,6 +298,11 @@ public interface RILConstants {
|
|
int SETUP_DATA_AUTH_CHAP = 2;
|
|
int SETUP_DATA_AUTH_PAP_CHAP = 3;
|
|
|
|
+ /* LCE service related constants. */
|
|
+ int LCE_NOT_AVAILABLE = -1;
|
|
+ int LCE_STOPPED = 0;
|
|
+ int LCE_ACTIVE = 1;
|
|
+
|
|
/**
|
|
* No restriction at all including voice/SMS/USSD/SS/AV64
|
|
* and packet data.
|
|
--
|
|
2.34.1
|
|
|