Merge "Correct the comparison done in removeAdapter." into mnc-dev (1cb0de17) · Commits · e / os / android_frameworks_base

telecomm/java/android/telecom/ConnectionServiceAdapter.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -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)) {
		if (adapter != null) {
		for (IConnectionServiceAdapter it : mAdapters) {
		if (it.asBinder() == adapter.asBinder() && mAdapters.remove(it)) {
		adapter.asBinder().unlinkToDeath(this, 0);
		break;
		}
		}
		}
		}