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

Commit 49c50a94 authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge "Move to newly defined metrics interface in ImsPhoneCallTracker" am:... 

Merge "Move to newly defined metrics interface in ImsPhoneCallTracker" am: 56a074eb am: 1f6993cc am: 8ba79fe3

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

Change-Id: Id1d7b1e4ebfb790fe3565345ca0ee09f6efeaf26
parents d49c0342 8ba79fe3

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

+10 −17
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ import android.util.SparseIntArray; 
import com.android.ims.FeatureConnector;

import com.android.ims.ImsCall;

import com.android.ims.ImsConfig;

import com.android.ims.ImsConfigListener;

import com.android.ims.ImsEcbm;

import com.android.ims.ImsException;

import com.android.ims.ImsManager;
@@ -1008,7 +1007,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        mImsManager.addRegistrationCallback(mPhone.getImsMmTelRegistrationCallback(), this::post);

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



        mImsManager.setConfigListener(mImsConfigListener);

        ImsManager.setImsStatsCallback(mPhone.getPhoneId(), mImsStatsCallback);



        mImsManager.getConfigInterface().addConfigCallback(mConfigCallback);
@@ -1073,7 +1072,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            mImsManager.removeRegistrationListener(mPhone.getImsMmTelRegistrationCallback());

            mImsManager.removeCapabilitiesCallback(mImsCapabilityCallback);

            try {

                mImsManager.setConfigListener(null);

                ImsManager.setImsStatsCallback(mPhone.getPhoneId(), null);

                mImsManager.getConfigInterface().removeConfigCallback(mConfigCallback.getBinder());

            } catch (ImsException e) {

                Log.w(LOG_TAG, "stopListeningForCalls: unable to remove config callback.");
@@ -3922,22 +3921,16 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                }

            };



    private ImsConfigListener.Stub mImsConfigListener = new ImsConfigListener.Stub() {

    private final ImsManager.ImsStatsCallback mImsStatsCallback =

            new ImsManager.ImsStatsCallback() {

        @Override

        public void onGetFeatureResponse(int feature, int network, int value, int status) {}



        @Override

        public void onSetFeatureResponse(int feature, int network, int value, int status) {

            mMetrics.writeImsSetFeatureValue(mPhone.getPhoneId(), feature, network, value);

            mPhone.getImsStats().onSetFeatureResponse(feature, network, value);

        public void onEnabledMmTelCapabilitiesChanged(int capability, int regTech,

                boolean isEnabled) {

            int enabledVal = isEnabled ? ProvisioningManager.PROVISIONING_VALUE_ENABLED

                    : ProvisioningManager.PROVISIONING_VALUE_DISABLED;

            mMetrics.writeImsSetFeatureValue(mPhone.getPhoneId(), capability, regTech, enabledVal);

            mPhone.getImsStats().onSetFeatureResponse(capability, regTech, enabledVal);

        }



        @Override

        public void onGetVideoQuality(int status, int quality) {}



        @Override

        public void onSetVideoQuality(int status) {}



    };



    private final ProvisioningManager.Callback mConfigCallback =