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

Merge "Fix a bug where updates of offers won't find existing offers" into sc-dev

Browse Source
This commit is contained in:
Chalard Jean
2021-04-13 01:33:21 +00:00
committed by Android (Google) Code Review
parent 93ea53bbe2 8220759546
commit f8300427d4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -6615,7 +6615,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;
} }

2
services/core/java/com/android/server/connectivity/NetworkOffer.java
View File

@@ -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");
} }