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

Commit 5d877c93 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Catch exception when unbinding" into rvc-dev am: 5cf0b4c8 

Change-Id: I03d0437d5d0543e4a18728a87d33838f9f50bc52
parents 22158e29 5cf0b4c8

src/java/com/android/internal/telephony/CarrierServiceBindHelper.java

+7 −1
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ public class CarrierServiceBindHelper { 
                                Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE,

                                (r) -> mHandler.post(r),

                                connection)) {

                    log("service bound");

                    mServiceBound = true;

                    return;

                }
@@ -340,7 +341,12 @@ public class CarrierServiceBindHelper { 
            if (mServiceBound) {

                log("Unbinding from carrier app");

                mServiceBound = false;

                try {

                    mContext.unbindService(connection);

                } catch (IllegalArgumentException e) {

                    //TODO(b/151328766): Figure out why we unbind without binding

                    loge("Tried to unbind without binding e=" + e);

                }

            } else {

                log("Not bound, skipping unbindService call");

            }