Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e87a9a48 authored by LuK1337's avatar LuK1337 Committed by Ricardo Cerqueira
Browse files

Handle IllegalArgumentException while setting default calling sub 

* How to reproduce:
  1. Add new SIP account
  2. Disable it in "All calling accounts"
  3. Reboot

Change-Id: Iaa2546588464a34871d7da8bba0b366d0ca43ab8
parent c7b58684

src/com/android/server/telecom/PhoneAccountRegistrar.java

+11 −6
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ import java.io.InputStream; 
import java.lang.Integer;

import java.lang.SecurityException;

import java.lang.String;

import java.lang.IllegalArgumentException;

import java.util.ArrayList;

import java.util.Collections;

import java.util.Iterator;
@@ -246,6 +247,7 @@ public final class PhoneAccountRegistrar { 
                return mState.accounts.get(i).getAccountHandle();

            }



            try {

                long subId = Long.parseLong(id);

                Log.i(this, "getUserSelectedVoicePhoneAccount, voice subId = "

                             + voiceSubId + " subId = " + subId + " mId = " + id);
@@ -253,6 +255,9 @@ public final class PhoneAccountRegistrar { 
                    prefPhoneAccount = mState.accounts.get(i).getAccountHandle();

                    break;

                }

            } catch (IllegalArgumentException e) {

                Log.w(this, "getUserSelectedVoicePhoneAccount, accountHandle ID = " + id);

            }

        }



        return prefPhoneAccount;