From 75c36b681e3331f4e60fa62abe4615c1ffc5b401 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Wed, 8 Jul 2015 16:52:37 -0700 Subject: Correct the comparison done in removeAdapter. Since addAdapter is storing the proxy binder objects in the adapter set, we need to compare the underlying binder objects when trying to remove the adapter from the adapter set. This was resulting in adapters accumulating in adapter set every time a RemoteService was created. BUG: 22062692 Change-Id: Ib9cc25a8b95622a524ed5a07d3ef56673669cd27 --- .../java/android/telecom/ConnectionServiceAdapter.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/telecomm/java/android/telecom/ConnectionServiceAdapter.java b/telecomm/java/android/telecom/ConnectionServiceAdapter.java index 4ab9ee5c2351..456251476862 100644 --- a/telecomm/java/android/telecom/ConnectionServiceAdapter.java +++ b/telecomm/java/android/telecom/ConnectionServiceAdapter.java @@ -48,6 +48,12 @@ final class ConnectionServiceAdapter implements DeathRecipient { } void addAdapter(IConnectionServiceAdapter adapter) { + for (IConnectionServiceAdapter it : mAdapters) { + if (it.asBinder() == adapter.asBinder()) { + Log.w(this, "Ignoring duplicate adapter addition."); + return; + } + } if (mAdapters.add(adapter)) { try { adapter.asBinder().linkToDeath(this, 0); @@ -58,8 +64,13 @@ final class ConnectionServiceAdapter implements DeathRecipient { } void removeAdapter(IConnectionServiceAdapter adapter) { - if (adapter != null && mAdapters.remove(adapter)) { - adapter.asBinder().unlinkToDeath(this, 0); + if (adapter != null) { + for (IConnectionServiceAdapter it : mAdapters) { + if (it.asBinder() == adapter.asBinder() && mAdapters.remove(it)) { + adapter.asBinder().unlinkToDeath(this, 0); + break; + } + } } } -- cgit v1.2.3-59-g8ed1b