diff options
author | Ricardo Cerqueira <ricardo@cyngn.com> | 2016-05-04 16:35:13 +0100 |
---|---|---|
committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2016-05-04 16:39:05 +0100 |
commit | 41b96a97cd4806b7076fa5b6a5353150efb18c7c (patch) | |
tree | 80430f12a9baca5319fff61f03c03cb0398a3745 | |
parent | cbf3ace21b9009301746d229669b9c2bb70af642 (diff) | |
download | android_packages_services_Telecomm-41b96a97cd4806b7076fa5b6a5353150efb18c7c.tar.gz android_packages_services_Telecomm-41b96a97cd4806b7076fa5b6a5353150efb18c7c.tar.bz2 android_packages_services_Telecomm-41b96a97cd4806b7076fa5b6a5353150efb18c7c.zip |
Fix sporadic crashes with MSIM devices and inactive SIMs
An MSIM device with a single inactive SIM (PIN locked, for instance)
can and frequently will get into a situation where it tries to set
ip invalid IDs (none have been assigned) as the "default" voice sub
Fixes CYNGNOS-2711
Change-Id: I7fcc1f42e5e74886192bbb5f8a74f3a69473e761
-rw-r--r-- | src/com/android/server/telecom/PhoneAccountRegistrar.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/server/telecom/PhoneAccountRegistrar.java b/src/com/android/server/telecom/PhoneAccountRegistrar.java index 539bd3b9..ebd09fd5 100644 --- a/src/com/android/server/telecom/PhoneAccountRegistrar.java +++ b/src/com/android/server/telecom/PhoneAccountRegistrar.java @@ -236,6 +236,10 @@ public final class PhoneAccountRegistrar { for (int i = 0; i < mState.accounts.size(); i++) { String id = mState.accounts.get(i).getAccountHandle().getId(); + if (id == null || id.equals("null") || TextUtils.isEmpty(id)) { + continue; + } + // emergency account present return it if (id.equals("E")) { Log.i(this, "getUserSelVoicePhoneAccount, emergency account "); |