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

Commit a2183240 authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Properly catch ServiceSpecificException if IMS isn't available" 

am: ba0576ee

Change-Id: I929859652a436c507c6c2af73afad3ea9292b981
parents ba526d50 ba0576ee

telephony/java/android/telephony/ims/ProvisioningManager.java

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.content.Context; 
import android.os.Binder;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.ServiceSpecificException;

import android.telephony.CarrierConfigManager;

import android.telephony.SubscriptionManager;

import android.telephony.ims.aidl.IImsConfigCallback;
@@ -377,6 +378,8 @@ public class ProvisioningManager { 
        callback.setExecutor(executor);

        try {

            getITelephony().registerImsProvisioningChangedCallback(mSubId, callback.getBinder());

        } catch (ServiceSpecificException e) {

            throw new ImsException(e.getMessage(), e.errorCode);

        } catch (RemoteException | IllegalStateException e) {

            throw new ImsException(e.getMessage(), ImsException.CODE_ERROR_SERVICE_UNAVAILABLE);

        }