Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Correct the comparison done in removeAdapter." into mnc-dev

Browse Source
This commit is contained in:
Roshan Pius
2015-07-10 16:54:42 +00:00
committed by Android (Google) Code Review
parent 3b9ce37b51 75c36b681e
commit 1cb0de17a9
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
telecomm/java/android/telecom/ConnectionServiceAdapter.java
View File

@@ -48,6 +48,12 @@ final class ConnectionServiceAdapter implements DeathRecipient {
} }
void addAdapter(IConnectionServiceAdapter adapter) { 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)) { if (mAdapters.add(adapter)) {
try { try {
adapter.asBinder().linkToDeath(this, 0); adapter.asBinder().linkToDeath(this, 0);
@@ -58,8 +64,13 @@ final class ConnectionServiceAdapter implements DeathRecipient {
} }
void removeAdapter(IConnectionServiceAdapter adapter) { void removeAdapter(IConnectionServiceAdapter adapter) {
if (adapter != null && mAdapters.remove(adapter)) { if (adapter != null) {
for (IConnectionServiceAdapter it : mAdapters) {
if (it.asBinder() == adapter.asBinder() && mAdapters.remove(it)) {
adapter.asBinder().unlinkToDeath(this, 0); adapter.asBinder().unlinkToDeath(this, 0);
break;
}
}
} }
} }