LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
.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
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: I7b9e0df21a3cca59659867a75792289ddee2f1d7
Change-Id: I7b9e0df21a3cca59659867a75792289ddee2f1d7
  (cherry-picked from ag/14125149)
This commit is contained in:
Chalard Jean
2021-04-08 17:37:36 +09:00
committed by Junyu Lai
parent 29cb06a3e0
commit 9f6d447a42
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
service/src/com/android/server/ConnectivityService.java
View File

@@ -6698,7 +6698,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
service/src/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");
} }