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

Commit 17af9b42 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Set Binder to null if linkToDeath throws RemoteException" am: c9ba2b57 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/1532479

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ideb9638218d089601dfd1051cae9b79cffb027e6
parents 6274fe94 c9ba2b57

src/java/com/android/ims/FeatureConnection.java

+10 −3
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ import android.util.Log; 


import com.android.internal.annotations.VisibleForTesting;



import java.util.NoSuchElementException;



/**

 * Base class of MmTelFeatureConnection and RcsFeatureConnection.

 */
@@ -79,7 +81,8 @@ public abstract class FeatureConnection { 
                    mBinder.linkToDeath(mDeathRecipient, 0);

                }

            } catch (RemoteException e) {

                // No need to do anything if the binder is already dead.

                Log.w(TAG, "setBinder: linkToDeath on already dead Binder, setting null");

                mBinder = null;

            }

        }

    }
@@ -103,9 +106,13 @@ public abstract class FeatureConnection { 
        synchronized (mLock) {

            if (mIsAvailable) {

                mIsAvailable = false;

                try {

                    if (mBinder != null) {

                        mBinder.unlinkToDeath(mDeathRecipient, 0);

                    }

                } catch (NoSuchElementException e) {

                    Log.w(TAG, "onRemovedOrDied: unlinkToDeath called on unlinked Binder.");

                }

            }

        }

    }