OSDN Git Service

Fix Possible Deadlock with getFeatureState
authorBrad Ebinger <breadley@google.com>
Thu, 21 Jun 2018 17:18:21 +0000 (10:18 -0700)
committerBrad Ebinger <breadley@google.com>
Fri, 22 Jun 2018 23:14:17 +0000 (16:14 -0700)
commit8f074959e5f5253d61b921a97e817960808ef5b6
tree901743f0e1f855f7b72a129c28c55e9b75317208
parent0be0692691db1d2b921deb43b4e0b8a55ced490f
Fix Possible Deadlock with getFeatureState

Use the ImsFeature lock for concurrency in MmTelFeature
instead of declaring its own lock.

Also, fixed up some other concurrency code.

Bug: 110507525
Test: Manual, Telephony Unit Tests
Change-Id: I5a7ef1beca619873a7c228bed0e1b82843d4de63
telephony/java/android/telephony/ims/feature/ImsFeature.java
telephony/java/android/telephony/ims/feature/MmTelFeature.java