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

Commit c99e7c34 authored by Wink Saville's avatar Wink Saville
Browse files

IccCardApplicatonStatus should not throw exceptions. 

Change from throwing exception to logging an error and mapping
to an XXXX_UKNOWN value.

Bug: 7449696
Change-Id: Iebed1c7893d120fb02821017643ee070d634bb19
parent 4750c8c1

src/java/com/android/internal/telephony/uicc/IccCardApplicationStatus.java

+17 −9
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.internal.telephony.uicc;



import android.telephony.Rlog;



import com.android.internal.telephony.uicc.IccCardStatus.PinState;
@@ -120,8 +122,8 @@ public class IccCardApplicationStatus { 
            case 4: newType = AppType.APPTYPE_CSIM;    break;

            case 5: newType = AppType.APPTYPE_ISIM;    break;

            default:

                throw new RuntimeException(

                            "Unrecognized RIL_AppType: " +type);

                newType = AppType.APPTYPE_UNKNOWN;

                loge("AppTypeFromRILInt: bad RIL_AppType: " + type + " use APPTYPE_UNKNOWN");

        }

        return newType;

    }
@@ -137,8 +139,8 @@ public class IccCardApplicationStatus { 
            case 4: newState = AppState.APPSTATE_SUBSCRIPTION_PERSO; break;

            case 5: newState = AppState.APPSTATE_READY; break;

            default:

                throw new RuntimeException(

                            "Unrecognized RIL_AppState: " +state);

                newState = AppState.APPSTATE_UNKNOWN;

                loge("AppStateFromRILInt: bad state: " + state + " use APPSTATE_UNKNOWN");

        }

        return newState;

    }
@@ -173,8 +175,9 @@ public class IccCardApplicationStatus { 
            case 23: newSubState = PersoSubState.PERSOSUBSTATE_RUIM_SERVICE_PROVIDER_PUK; break;

            case 24: newSubState = PersoSubState.PERSOSUBSTATE_RUIM_RUIM_PUK; break;

            default:

                throw new RuntimeException(

                            "Unrecognized RIL_PersoSubstate: " +substate);

                newSubState = PersoSubState.PERSOSUBSTATE_UNKNOWN;

                loge("PersoSubstateFromRILInt: bad substate: " + substate

                        + " use PERSOSUBSTATE_UNKNOWN");

        }

        return newSubState;

    }
@@ -201,7 +204,8 @@ public class IccCardApplicationStatus { 
                newPinState = PinState.PINSTATE_ENABLED_PERM_BLOCKED;

                break;

            default:

                throw new RuntimeException("Unrecognized RIL_PinState: " + state);

                newPinState = PinState.PINSTATE_UNKNOWN;

                loge("PinStateFromRILInt: bad pin state: " + state + " use PINSTATE_UNKNOWN");

        }

        return newPinState;

    }
@@ -223,4 +227,8 @@ public class IccCardApplicationStatus { 
        sb.append("}");

        return sb.toString();

    }



    private void loge(String s) {

        Rlog.e("IccCardApplicationStatus", s);

    }

}