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

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

Merge "Discard dead MmTelFeature Binder Instances" am: 9e1009dd am:... 

Merge "Discard dead MmTelFeature Binder Instances" am: 9e1009dd am: 36199d03 am: b985f685 am: 7bf20a9c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53828916cda6c29a3f1a77a4110e718e1a646d0d
parents 50e3dc0f 7bf20a9c

telephony/java/android/telephony/ims/stub/ImsEcbmImplBase.java

+6 −2
Original line number Diff line number Diff line
@@ -44,8 +44,12 @@ public class ImsEcbmImplBase { 
        @Override

        public void setListener(IImsEcbmListener listener) {

            synchronized (mLock) {

                if (mImsEcbm != null && listener != null && Objects.equals(

                        mImsEcbm.asBinder(), listener.asBinder())) {

                if (mListener != null && !mListener.asBinder().isBinderAlive()) {

                    Log.w(TAG, "setListener: discarding dead Binder");

                    mListener = null;

                }

                if (mListener != null && listener != null && Objects.equals(

                        mListener.asBinder(), listener.asBinder())) {

                    return;

                }

                if (listener == null) {

telephony/java/android/telephony/ims/stub/ImsMultiEndpointImplBase.java

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,10 @@ public class ImsMultiEndpointImplBase { 
        @Override

        public void setListener(IImsExternalCallStateListener listener) throws RemoteException {

            synchronized (mLock) {

                if (mListener != null && !mListener.asBinder().isBinderAlive()) {

                    Log.w(TAG, "setListener: discarding dead Binder");

                    mListener = null;

                }

                if (mListener != null && listener != null && Objects.equals(

                        mListener.asBinder(), listener.asBinder())) {

                    return;

telephony/java/android/telephony/ims/stub/ImsUtImplBase.java

+7 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.annotation.SystemApi; 
import android.os.Bundle;

import android.os.RemoteException;

import android.telephony.ims.ImsUtListener;

import android.util.Log;



import com.android.ims.internal.IImsUt;

import com.android.ims.internal.IImsUtListener;
@@ -41,6 +42,7 @@ import java.util.Objects; 
// will break other implementations of ImsUt maintained by other ImsServices.

@SystemApi

public class ImsUtImplBase {

    private static final String TAG = "ImsUtImplBase";

    /**

     * Bar all incoming calls. (See 3GPP TS 24.611)

     * @hide
@@ -207,6 +209,11 @@ public class ImsUtImplBase { 
        @Override

        public void setListener(IImsUtListener listener) throws RemoteException {

            synchronized (mLock) {

                if (mUtListener != null

                        && !mUtListener.getListenerInterface().asBinder().isBinderAlive()) {

                    Log.w(TAG, "setListener: discarding dead Binder");

                    mUtListener = null;

                }

                if (mUtListener != null && listener != null && Objects.equals(

                        mUtListener.getListenerInterface().asBinder(), listener.asBinder())) {

                    return;