Regenerate patches

frameworks/base got too messy, time to clean it up
This commit is contained in:
Andy CrossGate Yan
2021-02-14 10:41:04 +00:00
parent 85c08ba1de
commit 79b5b414a7
150 changed files with 615 additions and 881 deletions
@@ -1,7 +1,7 @@
From 23e23d28af5ef1029c223fb617f19cc6b3a3ce08 Mon Sep 17 00:00:00 2001
From c5db8caaf7f1391446cd50741d37ebbda9290694 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 16 Aug 2018 22:12:46 +0200
Subject: [PATCH] Add route to gateway on null netmask
Subject: [PATCH 1/9] Add route to gateway on null netmask
Galaxy S9 returns empty prefix
@@ -11,7 +11,7 @@ Change-Id: I8133da8e8f5203666684100009ba658528a02e94
1 file changed, 17 insertions(+)
diff --git a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
index 1202ce875..dcb72d4d7 100644
index 4d002846b..eb348e458 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
@@ -25,6 +25,7 @@ import android.app.PendingIntent;
@@ -22,7 +22,7 @@ index 1202ce875..dcb72d4d7 100644
import android.net.LinkAddress;
import android.net.LinkProperties;
import android.net.NetworkCapabilities;
@@ -1403,6 +1404,22 @@ public class DataConnection extends StateMachine {
@@ -1436,6 +1437,22 @@ public class DataConnection extends StateMachine {
}
for (InetAddress gateway : response.getGatewayAddresses()) {
@@ -46,5 +46,5 @@ index 1202ce875..dcb72d4d7 100644
// this indicates a point-to-point interface.
linkProperties.addRoute(new RouteInfo(gateway));
--
2.17.1
2.25.1
@@ -1,7 +1,7 @@
From e66ddf44169f3dda57d01a9dd5aded920bdc80a9 Mon Sep 17 00:00:00 2001
From 684919b3920b160ad7ef1d914b2b633580199e41 Mon Sep 17 00:00:00 2001
From: Artem Borisov <dedsa2002@gmail.com>
Date: Sat, 10 Nov 2018 17:19:17 +0000
Subject: [PATCH 2/6] Telephony: Don not call onUssdRelease for Huawei RIL
Subject: [PATCH 2/9] Telephony: Don not call onUssdRelease for Huawei RIL
Huawei RIL doesn't seem to work properly with USSD_MODE_NW_RELEASE,
always releasing USSD when it should be finished instead.
@@ -13,10 +13,10 @@ Change-Id: I69faed1c51d4582834879975d6ab13daf7f48ad4
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
index 6e539f0ae..14a322747 100644
index 06040d623..c5bb20631 100644
--- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
+++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
@@ -2313,7 +2313,11 @@ public class GsmCdmaPhone extends Phone {
@@ -2312,7 +2312,11 @@ public class GsmCdmaPhone extends Phone {
// Complete pending USSD
if (isUssdRelease) {
@@ -30,5 +30,5 @@ index 6e539f0ae..14a322747 100644
found.onUssdFinishedError();
} else {
--
2.17.1
2.25.1
@@ -1,7 +1,7 @@
From e67dac2c25d6a64230a866566fbc2636b2f73bc6 Mon Sep 17 00:00:00 2001
From 46bfcfb8cbe739e109060d3dfbbe469471b15f95 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Fri, 28 Dec 2018 13:06:32 +0100
Subject: [PATCH 3/6] Make MAX_CONNECTIONS_GSM settable from property
Subject: [PATCH 3/9] Make MAX_CONNECTIONS_GSM settable from property
cf https://github.com/phhusson/treble_experimentations/issues/110
@@ -24,5 +24,5 @@ index 0a7acee57..aca129308 100755
private static final int MAX_CONNECTIONS_CDMA = 8;
--
2.17.1
2.25.1
@@ -1,7 +1,7 @@
From 21952419962b9a642a5312e8258039bbbb5f893b Mon Sep 17 00:00:00 2001
From a038af3e1d22635a8b8832e4bd759a4d1aff9971 Mon Sep 17 00:00:00 2001
From: Dil3mm4 <dil3mm4.dev@gmail.com>
Date: Sat, 17 Nov 2018 18:18:42 +0000
Subject: [PATCH 4/6] Choose a more generic prop.
Subject: [PATCH 4/9] Choose a more generic prop.
Since USSD it's a problem over MTK too and not only on Kirin, let's be more generic.
@@ -11,10 +11,10 @@ Change-Id: Icf1700f55be40915f9c64059019287f300d81405
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
index 14a322747..8359a3858 100644
index c5bb20631..bd408e1c7 100644
--- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
+++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
@@ -2313,7 +2313,7 @@ public class GsmCdmaPhone extends Phone {
@@ -2312,7 +2312,7 @@ public class GsmCdmaPhone extends Phone {
// Complete pending USSD
if (isUssdRelease) {
@@ -24,5 +24,5 @@ index 14a322747..8359a3858 100644
} else {
found.onUssdRelease();
--
2.17.1
2.25.1
@@ -1,8 +1,8 @@
From acb8e3866e2c08c13fa3a111be911eee65c1cdbf Mon Sep 17 00:00:00 2001
From 7c40af0f45eb36d4dfc46c2d3b5acfa40bd61f2b Mon Sep 17 00:00:00 2001
From: Bevis Tseng <bevis@cloudmosa.com>
Date: Thu, 18 Apr 2019 16:30:45 +0800
Subject: [PATCH] Reverse-engineer MTK IRadio interfaces to approve incoming
call for MTK devices from Telephony F/W.
Subject: [PATCH 5/9] Reverse-engineer MTK IRadio interfaces to approve
incoming call for MTK devices from Telephony F/W.
This is an alternative solution of 's/AT+EAIC=2/AT+EAIC=3/g' in device/phh/treble/rw-system.sh
which is not workable on some MTK devices such as Nokia 1.
@@ -1526,10 +1526,10 @@ index 000000000..2548e967e
+ //-- MTK Radio V2_0
+}
diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
index 4e74cceee..c0c6db742 100644
index 83398b62c..96f1efdd7 100644
--- a/src/java/com/android/internal/telephony/RIL.java
+++ b/src/java/com/android/internal/telephony/RIL.java
@@ -237,6 +237,9 @@ public class RIL extends BaseCommands implements CommandsInterface {
@@ -245,6 +245,9 @@ public class RIL extends BaseCommands implements CommandsInterface {
final AtomicLong mRadioProxyCookie = new AtomicLong(0);
final RadioProxyDeathRecipient mRadioProxyDeathRecipient;
final RilHandler mRilHandler;
@@ -1539,7 +1539,7 @@ index 4e74cceee..c0c6db742 100644
//***** Events
static final int EVENT_WAKE_LOCK_TIMEOUT = 2;
@@ -494,6 +497,22 @@ public class RIL extends BaseCommands implements CommandsInterface {
@@ -502,6 +505,22 @@ public class RIL extends BaseCommands implements CommandsInterface {
}
}
@@ -1562,7 +1562,7 @@ index 4e74cceee..c0c6db742 100644
return mRadioProxy;
}
@@ -6060,4 +6079,23 @@ public class RIL extends BaseCommands implements CommandsInterface {
@@ -6157,4 +6176,23 @@ public class RIL extends BaseCommands implements CommandsInterface {
public boolean needsOldRilFeature(String feature) {
return mOldRilFeatures.contains(feature);
}
@@ -1587,7 +1587,7 @@ index 4e74cceee..c0c6db742 100644
+ }
}
diff --git a/src/java/com/android/internal/telephony/RadioResponse.java b/src/java/com/android/internal/telephony/RadioResponse.java
index a36b7a6fc..a52702f36 100644
index 97fe3dc13..509cb8336 100644
--- a/src/java/com/android/internal/telephony/RadioResponse.java
+++ b/src/java/com/android/internal/telephony/RadioResponse.java
@@ -1809,7 +1809,7 @@ public class RadioResponse extends IRadioResponse.Stub {
@@ -1600,5 +1600,5 @@ index a36b7a6fc..a52702f36 100644
if (rr != null) {
--
2.17.1
2.25.1
@@ -1,7 +1,7 @@
From d11dbfd4177f8e6e13965faf20de758d88265057 Mon Sep 17 00:00:00 2001
From 17f79dbb2628b9c58048a5d19b0bf02af7287de7 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 12 Aug 2019 23:49:56 +0200
Subject: [PATCH 6/6] Plugin Samsung RadioIndication/RadioResponse to get
Subject: [PATCH 6/9] Plugin Samsung RadioIndication/RadioResponse to get
signal strength
Change-Id: Ic3d5801627bf3dd72d2e7b6bb3741b9d368d1f07
@@ -27,10 +27,10 @@ index ae678cb54..bb9925beb 100644
"ims-common",
"services",
diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
index 47cb9f240..586dd063a 100644
index 96f1efdd7..4b94ca5d4 100644
--- a/src/java/com/android/internal/telephony/RIL.java
+++ b/src/java/com/android/internal/telephony/RIL.java
@@ -239,6 +239,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
@@ -248,6 +248,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
vendor.mediatek.hardware.radio.V2_0.IRadioResponse mMtkRadioResponse;
vendor.mediatek.hardware.radio.V2_0.IRadioIndication mMtkRadioIndication;
volatile vendor.mediatek.hardware.radio.V2_0.IRadio mMtkRadioProxy = null;
@@ -38,7 +38,7 @@ index 47cb9f240..586dd063a 100644
//***** Events
static final int EVENT_WAKE_LOCK_TIMEOUT = 2;
@@ -423,6 +424,26 @@ public class RIL extends BaseCommands implements CommandsInterface {
@@ -432,6 +433,26 @@ public class RIL extends BaseCommands implements CommandsInterface {
return mRadioProxy;
}
@@ -65,7 +65,7 @@ index 47cb9f240..586dd063a 100644
try {
if (mDisabledRadioServices.contains(mPhoneId)) {
riljLoge("getRadioProxy: mRadioProxy for " + HIDL_SERVICE_NAME[mPhoneId]
@@ -499,8 +520,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
@@ -508,8 +529,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
if (mRadioProxy != null) {
try {
mMtkRadioProxy =
@@ -75,7 +75,7 @@ index 47cb9f240..586dd063a 100644
if (mMtkRadioProxy != null) {
if (mMtkRadioResponse == null && mMtkRadioIndication == null) {
mMtkRadioResponse = new MtkRadioResponse(this, mRadioResponse);
@@ -511,6 +531,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
@@ -520,6 +540,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
} catch (RemoteException | RuntimeException e) {
riljLog("MTK RadioProxy is not available");
}
@@ -1083,5 +1083,5 @@ index 000000000..63e680afb
+ public void oemSelectCsgManualResponse(RadioResponseInfo info) {}
+}
--
2.17.1
2.25.1
@@ -1,7 +1,7 @@
From 5c9753b0fe01bf6b5b025a3c2ad9405e92341fc4 Mon Sep 17 00:00:00 2001
From d46c6ad5d946efad0ba6c675c027efce6f917632 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 13 Oct 2019 17:21:31 +0800
Subject: [PATCH 7/7] telephony: forward-port support for forceCognitive
Subject: [PATCH 7/9] telephony: forward-port support for forceCognitive
* This is needed on some MTK devices. Android 10 refactored some code,
so now the "non-persistent/cognitive" filter is relocated to RIL and
@@ -12,10 +12,10 @@ Subject: [PATCH 7/7] telephony: forward-port support for forceCognitive
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
index 586dd063a..cc8997ccc 100644
index 4b94ca5d4..39c5a2a33 100644
--- a/src/java/com/android/internal/telephony/RIL.java
+++ b/src/java/com/android/internal/telephony/RIL.java
@@ -3963,7 +3963,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
@@ -3991,7 +3991,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
for (DataProfile dp : dps) {
// For v1.0 to v1.2, we only send data profiles that has the persistent
// (a.k.a modem cognitive) bit set to true.
@@ -26,10 +26,10 @@ index 586dd063a..cc8997ccc 100644
}
}
diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
index 7a4bfd8d3..f5c54cc40 100644
index 43966a918..83e9ab7ce 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
@@ -1890,8 +1890,9 @@ public class DcTracker extends Handler {
@@ -2001,8 +2001,9 @@ public class DcTracker extends Handler {
}
// profile id is only meaningful when the profile is persistent on the modem.
@@ -41,5 +41,5 @@ index 7a4bfd8d3..f5c54cc40 100644
if (profileId == DATA_PROFILE_DEFAULT) {
profileId = getApnProfileID(apnContext.getApnType());
--
2.17.1
2.25.1
@@ -1,18 +1,17 @@
From 00bec8866bd675f39181051fb1e5c21d0a9d6de0 Mon Sep 17 00:00:00 2001
From a1752a0efd21d9c6a1bd373bd1773db4696f8f4a 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
Subject: [PATCH 8/9] 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
index 39c5a2a33..30d5fed86 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 {
@@ -1002,7 +1002,11 @@ public class RIL extends BaseCommands implements CommandsInterface {
if (result != null) {
AsyncResult.forMessage(result, null,
CommandException.fromRilErrno(REQUEST_NOT_SUPPORTED));
@@ -26,5 +25,5 @@ index 2fff03029..32ddd4e07 100644
return;
}
--
2.17.1
2.25.1
@@ -1,18 +1,18 @@
From 064f8936cd6d5e6d9a44a72bbc8600d092135e2c Mon Sep 17 00:00:00 2001
From 03dffbcc585e632105ee0e0e34f8719f0331d33c Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 2 Mar 2020 21:11:25 +0100
Subject: [PATCH 9/9] [HACK] Never blacklist RILs. It might get blacklisted for
bad reasons
Subject: [PATCH 9/9] Never blacklist RILs. It might get blacklisted for bad
reasons
---
src/java/com/android/internal/telephony/RIL.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
index 32ddd4e07..7565798f7 100644
index 30d5fed86..eb4d07700 100644
--- a/src/java/com/android/internal/telephony/RIL.java
+++ b/src/java/com/android/internal/telephony/RIL.java
@@ -504,7 +504,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
@@ -506,7 +506,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
mRadioProxyCookie.incrementAndGet());
mRadioProxy.setResponseFunctions(mRadioResponse, mRadioIndication);
} else {
@@ -22,5 +22,5 @@ index 32ddd4e07..7565798f7 100644
+ HIDL_SERVICE_NAME[mPhoneId] + " is disabled");
}
--
2.17.1
2.25.1