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

Commit 6d1777d8 authored by Chalard Jean's avatar Chalard Jean Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14125149

Change-Id: I7200938e84975231117979d2a2d904878d18f2b5
parents ac6b4a4d f8300427

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

+1 −1
Original line number Diff line number Diff line
@@ -6615,7 +6615,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            @NonNull final INetworkOfferCallback callback) {

        ensureRunningOnConnectivityServiceThread();

        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;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ public class NetworkOffer implements NetworkRanker.Scoreable { 
     * @param previousOffer the previous offer

     */

    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"

                    + " the same offer");

        }