Handle bindService() response on a new thread.
Earlier it was being handled on the default thread which is the
main thread. That was causing a deadlock as main thread was waiting
for another lock that was held by the delete() method (all main
methods in TelephonyProvider are synchronized).
Test: manually verified logs and the failing scenario
Test: atest TelephonyProviderTest
Bug: 160421742
Change-Id: Iaa8d92b9167b24340c79e82a268ad3819f4b76df
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index ac6ec2e..4303823 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -2838,8 +2838,10 @@
r.getString(R.string.apn_source_service)));
log("binding to service to restore apns, intent=" + intent);
try {
- if (context.bindService(intent, connection, Context.BIND_IMPORTANT |
- Context.BIND_AUTO_CREATE)) {
+ if (context.bindService(intent,
+ Context.BIND_IMPORTANT | Context.BIND_AUTO_CREATE,
+ runnable -> new Thread(runnable).start(),
+ connection)) {
synchronized (mLock) {
while (mIApnSourceService == null && !connectionBindingInvalid.get()) {
try {