34 lines
1.4 KiB
Diff
34 lines
1.4 KiB
Diff
From b8adbf5e35d5d1e40077b3226ad3f842fc9be6dc Mon Sep 17 00:00:00 2001
|
|
From: Pierre-Hugues Husson <phh@phh.me>
|
|
Date: Mon, 21 Sep 2020 10:30:18 +0200
|
|
Subject: [PATCH 23/25] On old inits (A-only devices), multi-sim basedband
|
|
property too long, catch that and make it shorter
|
|
|
|
Change-Id: I2f52595409f0d43b148063d5fd90c80d1182ff8c
|
|
---
|
|
telephony/java/android/telephony/TelephonyManager.java | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
|
|
index 8ae1ee99b06..4659c7909bc 100644
|
|
--- a/telephony/java/android/telephony/TelephonyManager.java
|
|
+++ b/telephony/java/android/telephony/TelephonyManager.java
|
|
@@ -10104,7 +10104,13 @@ public class TelephonyManager {
|
|
if (SubscriptionManager.isValidPhoneId(phoneId)) {
|
|
List<String> newList = updateTelephonyProperty(
|
|
TelephonyProperties.baseband_version(), phoneId, version);
|
|
- TelephonyProperties.baseband_version(newList);
|
|
+ try {
|
|
+ TelephonyProperties.baseband_version(newList);
|
|
+ } catch(java.lang.IllegalArgumentException e) {
|
|
+ List<String> list = new ArrayList<>();
|
|
+ list.add(newList.get(0));
|
|
+ TelephonyProperties.baseband_version(list);
|
|
+ }
|
|
}
|
|
}
|
|
|
|
--
|
|
2.17.1
|
|
|