Sync up to v212

This commit is contained in:
Andy CrossGate Yan
2020-02-27 14:07:15 +00:00
parent 5a4c7737ee
commit 9fe4d8ccf3
9 changed files with 767 additions and 6 deletions

View File

@@ -0,0 +1,30 @@
From 00bec8866bd675f39181051fb1e5c21d0a9d6de0 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 3 Feb 2020 23:35:23 +0100
Subject: [PATCH 8/8] [Hack] Catch spurious getModemStatus calls when enabling
CAF IMS
---
src/java/com/android/internal/telephony/RIL.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
index 2fff03029..32ddd4e07 100644
--- a/src/java/com/android/internal/telephony/RIL.java
+++ b/src/java/com/android/internal/telephony/RIL.java
@@ -988,7 +988,11 @@ public class RIL extends BaseCommands implements CommandsInterface {
if (result != null) {
AsyncResult.forMessage(result, null,
CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
- result.sendToTarget();
+ try {
+ result.sendToTarget();
+ } catch(IllegalStateException e) {
+ android.util.Log.d("PHH", "getModemStatus", e);
+ }
}
return;
}
--
2.17.1