blob: 74e8e5aad5386f08b07ac737af4e6857071da490 [file] [log] [blame]
Jon West75fbab72019-04-17 20:05:07 -04001From e6cf4987afa6d20418e59ed7426d3aa8ad99fdaa Mon Sep 17 00:00:00 2001
2From: Dil3mm4 <dil3mm4.dev@gmail.com>
3Date: Sat, 17 Nov 2018 18:18:42 +0000
4Subject: [PATCH 4/5] Choose a more generic prop.
5
6Since USSD it's a problem over MTK too and not only on Kirin, let's be more generic.
7
8Change-Id: Icf1700f55be40915f9c64059019287f300d81405
9
10Conflicts:
11 src/java/com/android/internal/telephony/GsmCdmaPhone.java
12---
13 src/java/com/android/internal/telephony/GsmCdmaPhone.java | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
17index a5ffb5da0..a1840aa43 100644
18--- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
19+++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
20@@ -2154,7 +2154,7 @@ public class GsmCdmaPhone extends Phone {
21 if (isUssdRelease) {
22 if (SystemProperties.getBoolean("ro.telephony.isHisiRIL", false)) {
23 found.onUssdFinished(ussdMessage, isUssdRequest);
24- } else if (SystemProperties.getBoolean("persist.sys.radio.huawei", false)) {
25+ } else if (SystemProperties.getBoolean("persist.sys.radio.ussd.fix", false)) {
26 found.onUssdFinished(ussdMessage, isUssdRequest);
27 } else {
28 found.onUssdRelease();
29--
302.17.1
31