Don't crash if unbinding from InCallService fails
If unbinding from an InCallService fails for any reason, don't
bring down the entire system process.
Bug: 21765111
Change-Id: I5651db361f5f0fdc7dd18a0799ead1ad20a0b9e3
diff --git a/src/com/android/server/telecom/InCallController.java b/src/com/android/server/telecom/InCallController.java
index 79110a4..7fc5842 100644
--- a/src/com/android/server/telecom/InCallController.java
+++ b/src/com/android/server/telecom/InCallController.java
@@ -273,7 +273,11 @@
while (iterator.hasNext()) {
final Map.Entry<ComponentName, InCallServiceConnection> entry = iterator.next();
Log.i(this, "Unbinding from InCallService %s", entry.getKey());
- mContext.unbindService(entry.getValue());
+ try {
+ mContext.unbindService(entry.getValue());
+ } catch (Exception e) {
+ Log.e(this, e, "Exception while unbinding from InCallService");
+ }
iterator.remove();
}
mInCallServices.clear();