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

Commit 3e521f37 authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge changes from topic "redo_ims_poll" am: 859329a1 am: 3890cf47 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1449477

Change-Id: I67529ebbdcab233ae7b69a53356f9d65e92699b4
parents 7c32137f 3890cf47

src/java/com/android/internal/telephony/ImsSmsDispatcher.java

+2 −2
Original line number Diff line number Diff line
@@ -292,8 +292,8 @@ public class ImsSmsDispatcher extends SMSDispatcher { 
    }



    private void setListeners() throws ImsException {

        getImsManager().addRegistrationCallback(mRegistrationCallback);

        getImsManager().addCapabilitiesCallback(mCapabilityCallback);

        getImsManager().addRegistrationCallback(mRegistrationCallback, this::post);

        getImsManager().addCapabilitiesCallback(mCapabilityCallback, this::post);

        getImsManager().setSmsListener(getSmsListener());

        getImsManager().onSmsReady();

    }

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

+0 −16
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ import android.util.LocalLog; 
import android.util.Log;

import android.util.SparseArray;



import com.android.ims.FeatureConnector;

import com.android.ims.ImsFeatureBinderRepository;

import com.android.ims.ImsFeatureContainer;

import com.android.ims.internal.IImsServiceFeatureCallback;
@@ -716,21 +715,6 @@ public class ImsResolver implements ImsServiceController.ImsServiceControllerCal 
        mRepo.registerForConnectionUpdates(slotId, feature, callback, mRunnableExecutor);

    }



    /**

     * Do not set up a persistent callback, but rather call back once depending on if the feature

     * requested exists.

     */

    public void callBackIfExists(int slotId, int feature, IImsServiceFeatureCallback callback) {

        ImsFeatureContainer c = mRepo.getIfExists(slotId, feature).orElse(null);

        try {

            if (c != null) {

                callback.imsFeatureCreated(c);

            } else {

                callback.imsFeatureRemoved(FeatureConnector.UNAVAILABLE_REASON_DISCONNECTED);

            }

        } catch (RemoteException ignore) { } //remote is dead.

    }



    /**

     * Unregister a previously registered IImsServiceFeatureCallback through

     * {@link #listenForFeature(int, int, IImsServiceFeatureCallback)}.

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+2 −2
Original line number Diff line number Diff line
@@ -981,8 +981,8 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        log("startListeningForCalls");

        mOperationLocalLog.log("startListeningForCalls - Connecting to ImsService");

        mImsManager.open(mMmTelFeatureListener);

        mImsManager.addRegistrationCallback(mPhone.getImsMmTelRegistrationCallback());

        mImsManager.addCapabilitiesCallback(mImsCapabilityCallback);

        mImsManager.addRegistrationCallback(mPhone.getImsMmTelRegistrationCallback(), this::post);

        mImsManager.addCapabilitiesCallback(mImsCapabilityCallback, this::post);



        mImsManager.setConfigListener(mImsConfigListener);

tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneCallTrackerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -229,7 +229,8 @@ public class ImsPhoneCallTrackerTest extends TelephonyTest { 
            mCapabilityCallback = (ImsMmTelManager.CapabilityCallback) invocation.getArguments()[0];

            return mCapabilityCallback;



        }).when(mImsManager).addCapabilitiesCallback(any(ImsMmTelManager.CapabilityCallback.class));

        }).when(mImsManager).addCapabilitiesCallback(

                any(ImsMmTelManager.CapabilityCallback.class), any());



        doReturn(mImsConfig).when(mImsManager).getConfigInterface();