Increase bind timeout timer.
In rare cases the binding can take more than 10 seconds, and when
carrierconfigloader processes both timeout and connected messages, it
will unbind twice from the service, causing illegalargument error.
A proper fix would require non-trivial refactoring of the code to
encapsulate the binding etc into an object with atomic cancel signal.
Bug: b/26592555
Change-Id: I7bac7f12c7bf60fd4f1d0fd10beb2075e9ad9f8c
diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 09f12ff..ca022b8 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -120,7 +120,7 @@
// Check if the system fingerprint has changed.
private static final int EVENT_CHECK_SYSTEM_UPDATE = 12;
- private static final int BIND_TIMEOUT_MILLIS = 10000;
+ private static final int BIND_TIMEOUT_MILLIS = 30000;
// Tags used for saving and restoring XML documents.
private static final String TAG_DOCUMENT = "carrier_config";