Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82207595 authored Apr 08, 2021 by Chalard Jean

Fix a bug where updates of offers won't find existing offers

.equals() only work on cross-process Binder instances if casted to
a Binder instance first.

Bug: 184281544
Test: ConnectivityServiceTest. CTS test for this specific issue to come
Change-Id: I7b9e0df21a3cca59659867a75792289ddee2f1d7

parent 4d736b92

services/core/java/com/android/server/ConnectivityService.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6601,7 +6601,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
	@NonNull final INetworkOfferCallback callback) {		@NonNull final INetworkOfferCallback callback) {
	ensureRunningOnConnectivityServiceThread();		ensureRunningOnConnectivityServiceThread();
	for (final NetworkOfferInfo noi : mNetworkOffers) {		for (final NetworkOfferInfo noi : mNetworkOffers) {
	if (noi.offer.callback.equals(callback)) return noi;		if (noi.offer.callback.asBinder().equals(callback.asBinder())) return noi;
	}		}
	return null;		return null;
	}		}

services/core/java/com/android/server/connectivity/NetworkOffer.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -133,7 +133,7 @@ public class NetworkOffer implements NetworkRanker.Scoreable {
	* @param previousOffer the previous offer		* @param previousOffer the previous offer
	*/		*/
	public void migrateFrom(@NonNull final NetworkOffer previousOffer) {		public void migrateFrom(@NonNull final NetworkOffer previousOffer) {
	if (!callback.equals(previousOffer.callback)) {		if (!callback.asBinder().equals(previousOffer.callback.asBinder())) {
	throw new IllegalArgumentException("Can only migrate from a previous version of"		throw new IllegalArgumentException("Can only migrate from a previous version of"
	+ " the same offer");		+ " the same offer");
	}		}