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

Commit edcb2dd7 authored by Rambo Wang's avatar Rambo Wang Committed by Automerger Merge Worker
Browse files

Merge "Always call unbindService no matter what bindService returns" am: b0a32912 am: 220b1056 

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

Change-Id: I29755ce4dc0fab1e5a2373cb9d94f39b9e53a389
parents bb05e45c 220b1056

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

+5 −12
Original line number Diff line number Diff line
@@ -71,9 +71,6 @@ public class CarrierServiceBindHelper { 
    private final PackageChangeReceiver mPackageMonitor = new CarrierServicePackageMonitor();

    private final LocalLog mLocalLog = new LocalLog(100);



    // whether we have successfully bound to the service

    private boolean mServiceBound = false;



    private BroadcastReceiver mUserUnlockedReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {
@@ -291,7 +288,6 @@ public class CarrierServiceBindHelper { 
                        (r) -> mHandler.post(r),

                        connection)) {

                    logdWithLocalLog("service bound");

                    mServiceBound = true;

                    return;

                }
@@ -346,17 +342,14 @@ public class CarrierServiceBindHelper { 
            carrierPackage = null;

            carrierServiceClass = null;



            // Actually unbind

            if (mServiceBound) {

                logdWithLocalLog("Unbinding from carrier app");

                mServiceBound = false;

            // Always call unbindService, no matter if bindService succeed.

            if (connection != null) {

                mContext.unbindService(connection);

            } else {

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

            }

                logdWithLocalLog("Unbinding from carrier app");

                connection = null;

                mUnbindScheduledUptimeMillis = -1;

            }

        }



        private void cancelScheduledUnbind() {

            logdWithLocalLog("cancelScheduledUnbind");