commit 5b78b2ffbb2ce6d18a38400eb419ad8aace3bdb2
author Rambo Wang <rambowang@google.com> Wed Sep 29 23:32:14 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 29 23:32:14 2021 +0000
tree 724fa76f676ebda6497560ea3f6771d14300f18a
parent 97a73dbb6ae823c77938d4451f7d2225d8bb8b06
parent 3701cae0af267753efe1ebe8779c85ee650d082b

Merge "CarrierServiceBindHelper: context mismatch in bindService vs unbindservice"

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

diff --git a/src/java/com/android/internal/telephony/CarrierServiceBindHelper.java b/src/java/com/android/internal/telephony/CarrierServiceBindHelper.java
index 817a461..4b4980e 100644
--- a/src/java/com/android/internal/telephony/CarrierServiceBindHelper.java
+++ b/src/java/com/android/internal/telephony/CarrierServiceBindHelper.java
@@ -128,7 +128,7 @@
     };
 
     public CarrierServiceBindHelper(Context context) {
-        mContext = context;
+        mContext = context.createContextAsUser(Process.myUserHandle(), 0);
 
         updateBindingsAndSimStates();
 
@@ -283,13 +283,13 @@
 
             String error;
             try {
-                if (mContext.createContextAsUser(Process.myUserHandle(), 0)
-                        .bindService(carrierService,
-                                Context.BIND_AUTO_CREATE
+                if (mContext.bindService(
+                        carrierService,
+                        Context.BIND_AUTO_CREATE
                                 | Context.BIND_FOREGROUND_SERVICE
                                 | Context.BIND_INCLUDE_CAPABILITIES,
-                                (r) -> mHandler.post(r),
-                                connection)) {
+                        (r) -> mHandler.post(r),
+                        connection)) {
                     logdWithLocalLog("service bound");
                     mServiceBound = true;
                     return;
@@ -350,12 +350,7 @@
             if (mServiceBound) {
                 logdWithLocalLog("Unbinding from carrier app");
                 mServiceBound = false;
-                try {
-                    mContext.unbindService(connection);
-                } catch (IllegalArgumentException e) {
-                    //TODO(b/151328766): Figure out why we unbind without binding
-                    logeWithLocalLog("Tried to unbind without binding e=" + e);
-                }
+                mContext.unbindService(connection);
             } else {
                 logdWithLocalLog("Not bound, skipping unbindService call");
             }