aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Ebinger <breadley@google.com>2018-03-08 13:14:38 -0800
committerBrad Ebinger <breadley@google.com>2018-03-19 11:02:37 -0700
commit57f6a85c80fe022e3844d5d203839023149ea471 (patch)
treeabf263a8ac96a102c6fe6ffbf474bb999774ab3b
parentfe2b2222bb6ab7049a8c869972bd6012cfaf2a02 (diff)
downloadims-57f6a85c80fe022e3844d5d203839023149ea471.tar.gz
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 Merged-In: I48a554c509b61094dd65b3d8ac6195a891508a64 Change-Id: I458db42cd815f87f57eab6b13878532105297180
-rw-r--r--src/java/com/android/ims/MmTelFeatureConnection.java18
1 files 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;
}
}