Merge "Show time stamp of missed call notification created by Telecom"
diff --git a/src/com/android/server/telecom/InCallController.java b/src/com/android/server/telecom/InCallController.java
index 169ebd7..6fc53b3 100644
--- a/src/com/android/server/telecom/InCallController.java
+++ b/src/com/android/server/telecom/InCallController.java
@@ -287,7 +287,7 @@
}
protected void onDisconnected() {
- InCallController.this.onDisconnected(mInCallServiceInfo.getComponentName());
+ InCallController.this.onDisconnected(mInCallServiceInfo);
disconnect(); // Unbind explicitly if we get disconnected.
if (mListener != null) {
mListener.onDisconnect(InCallServiceBindingConnection.this);
@@ -1010,6 +1010,7 @@
mNonUIInCallServiceConnections.disconnect();
mNonUIInCallServiceConnections = null;
}
+ mInCallServices.clear();
}
/**
@@ -1303,12 +1304,12 @@
/**
* Cleans up an instance of in-call app after the service has been unbound.
*
- * @param disconnectedComponent The {@link ComponentName} of the service which disconnected.
+ * @param disconnectedInfo The {@link InCallServiceInfo} of the service which disconnected.
*/
- private void onDisconnected(ComponentName disconnectedComponent) {
- Log.i(this, "onDisconnected from %s", disconnectedComponent);
+ private void onDisconnected(InCallServiceInfo disconnectedInfo) {
+ Log.i(this, "onDisconnected from %s", disconnectedInfo.getComponentName());
- mInCallServices.remove(disconnectedComponent);
+ mInCallServices.remove(disconnectedInfo);
}
/**
