diff options
| author | rambowang <rambowang@google.com> | 2023-02-06 18:24:59 -0600 |
|---|---|---|
| committer | rambowang <rambowang@google.com> | 2023-02-06 18:27:11 -0600 |
| commit | bc8832aa5f7ec066d3b10d668d887c4bd1082474 (patch) | |
| tree | d38a6d7695c0c192a8d25ffe37e416babb402f85 /src/java/com/android/internal/telephony/uicc | |
| parent | 8d36657af03b91933c34e9c85b283794b7c44d5b (diff) | |
| download | telephony-bc8832aa5f7ec066d3b10d668d887c4bd1082474.tar.gz | |
Fix phone process crash due to null carrier config
Perform null pointer check on the carrier config bundle subset return
from CarrierConfigManager#getConfigForSub call to make sure it will
not crash the phone process.
Bug: 266962389
Test: atest FrameworksTelephonyTests
Change-Id: I2f142279d267705fa678e8b632228eef475d7f6f
Diffstat (limited to 'src/java/com/android/internal/telephony/uicc')
| -rw-r--r-- | src/java/com/android/internal/telephony/uicc/UiccProfile.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/java/com/android/internal/telephony/uicc/UiccProfile.java b/src/java/com/android/internal/telephony/uicc/UiccProfile.java index 6d73e58098..1d8615b0ee 100644 --- a/src/java/com/android/internal/telephony/uicc/UiccProfile.java +++ b/src/java/com/android/internal/telephony/uicc/UiccProfile.java @@ -1819,13 +1819,13 @@ public class UiccProfile extends IccCard { @NonNull private PersistableBundle getCarrierConfigSubset(int subId, String... keys) { - PersistableBundle bundle = new PersistableBundle(); + PersistableBundle bundle = null; try { bundle = mCarrierConfigManager.getConfigForSubId(subId, keys); } catch (RuntimeException e) { loge("CarrierConfigLoader is not available."); } - return bundle; + return bundle != null ? bundle : new PersistableBundle(); } private static String eventToString(int event) { |