From 9ffeebf0c18148d2064d22cca8e548863163b9c6 Mon Sep 17 00:00:00 2001 From: Brad Ebinger Date: Thu, 8 Mar 2018 13:14:38 -0800 Subject: Do not Lock on Registration and Config Query ImsRegistration and ImsConfig interfaces do not need to be locked on because they access a TelephonyManager API independent of MmTelFeature state. Bug: 74119196 Test: Telephony Unit Tests Change-Id: I458db42cd815f87f57eab6b13878532105297180 --- src/java/com/android/ims/MmTelFeatureConnection.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/java/com/android/ims/MmTelFeatureConnection.java b/src/java/com/android/ims/MmTelFeatureConnection.java index 276688c4..5679591b 100644 --- a/src/java/com/android/ims/MmTelFeatureConnection.java +++ b/src/java/com/android/ims/MmTelFeatureConnection.java @@ -484,22 +484,16 @@ public class MmTelFeatureConnection { } public IImsConfig getConfigInterface() throws RemoteException { - synchronized (mLock) { - checkServiceIsReady(); - return getConfig(); - } + return getConfig(); } public @ImsRegistrationImplBase.ImsRegistrationTech int getRegistrationTech() - throws RemoteException { - synchronized (mLock) { - checkServiceIsReady(); - IImsRegistration registration = getRegistration(); - if (registration != null) { + throws RemoteException { + IImsRegistration registration = getRegistration(); + if (registration != null) { return registration.getRegistrationTechnology(); - } else { - return ImsRegistrationImplBase.REGISTRATION_TECH_NONE; - } + } else { + return ImsRegistrationImplBase.REGISTRATION_TECH_NONE; } } -- cgit v1.2.3