Merge "Properly catch ServiceSpecificException if IMS isn't available"
am: ba0576ee28
Change-Id: I929859652a436c507c6c2af73afad3ea9292b981
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user