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

Commit fbb0d211 authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Merge "Catch all Exceptions in Telephony when accessing ImsService" am: 21a17bb7 

am: 8ae31c80

Bug: 130541585
Test: manual; atest FrameworksTelephonyTests
Merged-In: Id1e897bf12805975003c1e260be82dad187aee48
Change-Id: Id1e897bf12805975003c1e260be82dad187aee48
(cherry picked from commit 5e1a61dc7fee2551fadebce3e17ade7b94ab901b)
parent 0ea02d7f

src/java/com/android/internal/telephony/ims/ImsServiceFeatureQueryManager.java

+1 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.content.Context; 
import android.content.Intent;

import android.content.ServiceConnection;

import android.os.IBinder;

import android.os.RemoteException;

import android.telephony.ims.aidl.IImsServiceController;

import android.telephony.ims.stub.ImsFeatureConfiguration;

import android.util.Log;
@@ -86,7 +85,7 @@ public class ImsServiceFeatureQueryManager { 
            ImsFeatureConfiguration config;

            try {

                config = controller.querySupportedImsFeatures();

            } catch (RemoteException e) {

            } catch (Exception e) {

                Log.w(LOG_TAG, "queryImsFeatures - error: " + e);

                cleanup();

                mListener.onError(mName);