aboutsummaryrefslogtreecommitdiff
path: root/src/java/com/android/ims
diff options
context:
space:
mode:
authorHyosun Kim <hyosunkim@google.com>2022-04-13 03:49:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-04-13 03:49:05 +0000
commitd0b577941c0f655d094b627cbe523ff2d532a8c2 (patch)
tree035af8eba9689df081379835a69f15a4876105f9 /src/java/com/android/ims
parent6340dacb4e42e595268563d4c74606c304696e0b (diff)
parent6d19fa7df288debda7ee4a298db83eeb89ef94c0 (diff)
downloadims-d0b577941c0f655d094b627cbe523ff2d532a8c2.tar.gz
Merge "Even though the state of the ImsFeature is set to STATE_UNAVAILABLE, fixed CapabilityCallbackManager#unregisterCallback to complete successfully." into tm-dev
Diffstat (limited to 'src/java/com/android/ims')
-rw-r--r--src/java/com/android/ims/MmTelFeatureConnection.java9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/java/com/android/ims/MmTelFeatureConnection.java b/src/java/com/android/ims/MmTelFeatureConnection.java
index 333dc560..cd8c3f15 100644
--- a/src/java/com/android/ims/MmTelFeatureConnection.java
+++ b/src/java/com/android/ims/MmTelFeatureConnection.java
@@ -135,15 +135,12 @@ public class MmTelFeatureConnection extends FeatureConnection {
public void unregisterCallback(IImsCapabilityCallback localCallback) {
IImsMmTelFeature binder;
synchronized (mLock) {
- try {
- checkServiceIsReady();
- binder = getServiceInterface(mBinder);
- } catch (RemoteException e) {
- // binder is null
+ if (!isBinderAlive()) {
Log.w(TAG + " [" + mSlotId + "]", "CapabilityCallbackManager, unregister:"
- + " couldn't get binder.");
+ + " binder is not alive");
return;
}
+ binder = getServiceInterface(mBinder);
}
if (binder != null) {
try {