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

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

Include Context in ImsServiceProxy Compat Layer am: 3418c136 am: a6575492 

am: 7aafd2a6

Change-Id: I730796b71affa6f279f22fa4624f27ad661b724c
parents aee697f2 7aafd2a6

src/java/com/android/ims/ImsManager.java

+6 −3
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import com.android.ims.internal.IImsCallSession; 
import com.android.ims.internal.IImsConfig;

import com.android.ims.internal.IImsEcbm;

import com.android.ims.internal.IImsMultiEndpoint;

import com.android.ims.internal.IImsRegistration;

import com.android.ims.internal.IImsRegistrationCallback;

import com.android.ims.internal.IImsRegistrationListener;

import com.android.ims.internal.IImsServiceController;
@@ -1427,8 +1428,10 @@ public class ImsManager { 
                    checkAndThrowExceptionIfServiceUnavailable();

                    // TODO: Remove once new MmTelFeature is merged in

                    mImsServiceProxy.addRegistrationListener(mImsRegistrationListenerProxy);

                    mImsServiceProxy.getRegistration().addRegistrationCallback(

                            mRegistrationCallback);

                    IImsRegistration regBinder = mImsServiceProxy.getRegistration();

                    if (regBinder != null) {

                        regBinder.addRegistrationCallback(mRegistrationCallback);

                    }

                    log("Registration Callback/Listener registered.");

                    // Only record if there isn't a RemoteException.

                    mHasRegisteredForProxy = true;
@@ -1871,7 +1874,7 @@ public class ImsManager { 
        if (!mConfigDynamicBind) {

            // Deprecated method of binding

            Rlog.i(TAG, "Creating ImsService using ServiceManager");

            mImsServiceProxy = ImsServiceProxyCompat.create(mPhoneId, mDeathRecipient);

            mImsServiceProxy = ImsServiceProxyCompat.create(mContext, mPhoneId, mDeathRecipient);

        } else {

            Rlog.i(TAG, "Creating ImsService using ImsResolver");

            mImsServiceProxy = ImsServiceProxy.create(mContext, mPhoneId);

src/java/com/android/ims/ImsServiceProxy.java

+3 −3
Original line number Diff line number Diff line
@@ -147,15 +147,15 @@ public class ImsServiceProxy { 
        }

    };



    public ImsServiceProxy(int slotId, IBinder binder, int featureType) {

    public ImsServiceProxy(Context context, int slotId, IBinder binder, int featureType) {

        mSlotId = slotId;

        mBinder = binder;

        mSupportedFeature = featureType;

        mContext = context;

    }



    public ImsServiceProxy(Context context, int slotId, int featureType) {

        this(slotId, null, featureType);

        mContext = context;

        this(context, slotId, null, featureType);

    }



    public @Nullable IImsRegistration getRegistration() {

src/java/com/android/ims/ImsServiceProxyCompat.java

+5 −4
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ public class ImsServiceProxyCompat extends ImsServiceProxy { 
     */

    private static final String IMS_SERVICE = "ims";



    public static ImsServiceProxyCompat create(int slotId, IBinder.DeathRecipient recipient) {

    public static ImsServiceProxyCompat create(Context context, int slotId,

            IBinder.DeathRecipient recipient) {

        IBinder binder = ServiceManager.checkService(IMS_SERVICE);



        if (binder != null) {
@@ -66,11 +67,11 @@ public class ImsServiceProxyCompat extends ImsServiceProxy { 


        // If the proxy is created with a null binder, subsequent calls that depend on a live

        // binder will fail, causing this structure to be torn down and created again.

        return new ImsServiceProxyCompat(slotId, binder);

        return new ImsServiceProxyCompat(context, slotId, binder);

    }



    public ImsServiceProxyCompat(int slotId, IBinder binder) {

        super(slotId, binder, SERVICE_ID);

    public ImsServiceProxyCompat(Context context, int slotId, IBinder binder) {

        super(context, slotId, binder, SERVICE_ID);

    }



    @Override