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

Commit e853b7dc authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Ignore onNullBinding if onBindingDied in ImsService resolver 

The framework will call onBindingDied followed by onNullBinding
in the case that the app dies. In this case, ignore onNullBinding.

Fixes: 180974457
Test: manual
Change-Id: I48585a1cfb82a5c783085323897f89bd2c46cfcb
parent 3d4707af

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

+8 −0
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ public class ImsServiceFeatureQueryManager { 


        private final ComponentName mName;

        private final String mIntentFilter;

        // Track the status of whether or not the Service has died in case we need to permanently

        // unbind (see onNullBinding below).

        private boolean mIsServiceConnectionDead = false;





        ImsServiceFeatureQuery(ComponentName name, String intentFilter) {

            mName = name;
@@ -85,6 +89,7 @@ public class ImsServiceFeatureQueryManager { 


        @Override

        public void onBindingDied(ComponentName name) {

            mIsServiceConnectionDead = true;

            Log.w(LOG_TAG, "onBindingDied: " + name);

            cleanup();

            // retry again!
@@ -94,6 +99,9 @@ public class ImsServiceFeatureQueryManager { 
        @Override

        public void onNullBinding(ComponentName name) {

            Log.w(LOG_TAG, "onNullBinding: " + name);

            // onNullBinding will happen after onBindingDied. In this case, we should not

            // permanently unbind and instead let the automatic rebind occur.

            if (mIsServiceConnectionDead) return;

            cleanup();

            mListener.onPermanentError(name);

        }