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

Commit 317c552a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Catch SSE when no subId is loaded" am: cc3f4cc0 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1501011

Change-Id: Ibda753abec714576986b5ca94e65eb64091d1e26
parents d45305b2 cc3f4cc0

telephony/java/android/telephony/ims/ImsRcsManager.java

+6 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.content.Intent; 
import android.os.Binder;

import android.os.IBinder;

import android.os.RemoteException;

import android.os.ServiceSpecificException;

import android.provider.Settings;

import android.telephony.AccessNetworkConstants;

import android.telephony.BinderCacheManager;
@@ -198,6 +199,8 @@ public class ImsRcsManager { 
        c.setExecutor(executor);

        try {

            imsRcsController.registerImsRegistrationCallback(mSubId, c.getBinder());

        } catch (ServiceSpecificException e) {

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

        } catch (RemoteException | IllegalStateException e) {

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

        }
@@ -333,6 +336,9 @@ public class ImsRcsManager { 
        c.setExecutor(executor);

        try {

            imsRcsController.registerRcsAvailabilityCallback(mSubId, c.getBinder());



        } catch (ServiceSpecificException e) {

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

        } catch (RemoteException e) {

            Log.e(TAG, "Error calling IImsRcsController#registerRcsAvailabilityCallback", e);

            throw new ImsException("Remote IMS Service is not available",

telephony/java/android/telephony/ims/RcsUceAdapter.java

+7 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.net.Uri; 
import android.os.Binder;

import android.os.IBinder;

import android.os.RemoteException;

import android.os.ServiceSpecificException;

import android.telephony.TelephonyFrameworkInitializer;

import android.telephony.ims.aidl.IImsRcsController;

import android.telephony.ims.aidl.IRcsUceControllerCallback;
@@ -463,6 +464,8 @@ public class RcsUceAdapter { 
        try {

            imsRcsController.requestCapabilities(mSubId, mContext.getOpPackageName(),

                    mContext.getAttributionTag(), contactNumbers, internalCallback);

        } catch (ServiceSpecificException e) {

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

        } catch (RemoteException e) {

            Log.e(TAG, "Error calling IImsRcsController#requestCapabilities", e);

            throw new ImsException("Remote IMS Service is not available",
@@ -545,6 +548,8 @@ public class RcsUceAdapter { 
        try {

            imsRcsController.requestNetworkAvailability(mSubId, mContext.getOpPackageName(),

                    mContext.getAttributionTag(), contactNumber, internalCallback);

        } catch (ServiceSpecificException e) {

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

        } catch (RemoteException e) {

            Log.e(TAG, "Error calling IImsRcsController#requestNetworkAvailability", e);

            throw new ImsException("Remote IMS Service is not available",
@@ -574,7 +579,7 @@ public class RcsUceAdapter { 


        try {

            return imsRcsController.getUcePublishState(mSubId);

        } catch (android.os.ServiceSpecificException e) {

        } catch (ServiceSpecificException e) {

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

        } catch (RemoteException e) {

            Log.e(TAG, "Error calling IImsRcsController#getUcePublishState", e);
@@ -621,7 +626,7 @@ public class RcsUceAdapter { 
        c.setExecutor(executor);

        try {

            imsRcsController.registerUcePublishStateCallback(mSubId, c.getBinder());

        } catch (android.os.ServiceSpecificException e) {

        } catch (ServiceSpecificException e) {

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

        } catch (RemoteException e) {

            Log.e(TAG, "Error calling IImsRcsController#registerUcePublishStateCallback", e);